Merge changes I1572afcf,Ia6786225,Ia338f92c,I58312b59 am: fade75c7a8
am: 58660f601e

Change-Id: Iaf1f2dcd124fb44501a95b59ca9c1b5204aa27ae