[automerger skipped] Sync with upstream 95647bc8: am: 09980abea7
am: 4eef244fcb -s ours
am skip reason: change_id I1d9f5fe46aed85a9d374a9e91a0058a193f4cf43 with SHA1 a1ce7ebac9 is in history

Change-Id: I568b418430cd174c827974a3e736f74bae66ac5a