Test: Build success Bug: 354243057 Flag: NONE cleanup Change-Id: If265dd13902efd675bf0f00254c3d030b1806c29