Bug: 145096015 Test: make checkbuild Change-Id: I45462071dfce5dca3df97c50a784c38e02b83ad6
f1e0f2e365
22202139d5