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

Change-Id: I1fc818a24301a887a2c4013f4358d455d1fb67cb