[automerger skipped] Merge changes I843fd9ef,Ife0a5721,I18b28a3a,I4439342c,Id8b870b6 am: 181e024f3d
am: 747c01e150 -s ours
am skip reason: change_id I843fd9efbdbf786ab7aa5ed62b4e1395ae7cf335 with SHA1 346ac6a5fa is in history

Change-Id: I4f4e8d9c3b57eb6c5941c789328b0301aec8a9c4