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

Change-Id: Ia69be41b0b013ae6214781a42445f20e07cf2dde