[automerger skipped] Fix bug in dogfood mode am: 554a4f742d am: 09793f5191 am: ef77987aa1 am: 27cc80d1fc
am: 271d6448c6 -s ours
am skip reason: change_id I5a05bd93dbe246b172d4de30148c0c06b8174b7e with SHA1 e7a8f7235d is in history

Change-Id: Ifa06db49c216a4f41945fe325995bb31d2b418d4