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

Change-Id: I97967a3672755fbdc0214daab0be77e6bbaa6c15