[automerger skipped] Merge changes I34842acd,Icc6c4d6b am: fb3dccd961 am: b6081962ee am: cfc5bfc703 -s ours
am skip reason: Change-Id I34842acd94b972e440c3622f7617df10c18acf65 with SHA-1 84229e0a8e is in history

Change-Id: I7068557f0d30c9066e9bdcb2dd674dab8964a4b9