Merge changes I5f3b98aa,I6077d014,I276dbb46 am: 92a4974663
am: d1a8b72479

Change-Id: I12048bfc85c504f8117f99a9138cb824534ce5a3