[automerger skipped] Fix build more am: d9d5f654c7  -s ours
am: 4b6a13ed45  -s ours

Change-Id: I702fa340b475688794ddb0e42a339f13e24b4770