[automerger skipped] Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4 am: 870c267b6c
am: 67e55b4b70 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: I5785a8c976d675237289c1a5c6ef672615a4d773