Merge changes I9248fbaf,Ifd795776,I201109b5 am: 21d98807bd
am: a1b35b544f

Change-Id: Ic618f6f3c542f51ee94cca231064cb800a5a4f05