[automerger skipped] Improved 'am switch' to handle errors. am: 2d950c12 am:...

[automerger skipped] Improved 'am switch' to handle errors. am: 2d950c12 am: 0db55184 -s ours am: 5f7a2997 -s ours am: 556e2ae3 -s ours am: 90d4b71b -s ours
am skip reason: Change-Id I005c76652be1fd0908f5c2b40e2513362b5ce5ac with SHA-1 75aeb684 is in history

Change-Id: If833f5b75748eb8b4cd91ff8d423e0ff17c481e1