[automerger skipped] Add logs for debugging am: 5b163cfc am: 36cd1221 -s ours am: 266e7c38 -s ours
am skip reason: Change-Id I85adb8c3c5598ef4ce11550b51f22d1ce3c282a6 with SHA-1 5b163cfc is in history
Change-Id: Ib758d6d074ff149423cbf1ea62cc7231bf212804