am: 56eaeedbb4 Change-Id: I6ff74db8a3bcc83768418293a4410e1b05daa732
56eaeedbb4
Bug: 35767068 Test: No build failure on update. Change-Id: Iab619e80da63685212043f88d30c171a013f8925 Merged-in: Iab619e80da63685212043f88d30c171a013f8925