Moved to default values Test: build Bug: 222323543 Change-Id: I8993d1e587f1d0241e54e2ddc34ca551e89d8546