Test: presubmits and manual verification Bug: 274930471 Change-Id: Iafc85526afdb8264526e8a5a33319fa33a23c66b