[automerger skipped] Fix build
am: 3e0fd90693  -s ours

Change-Id: I814a48bdab01da6aab05b08ff58c688f4909170a