Merge changes I4d8da7ce,I4da5be01,Idfbead82 am: 31167a5785
am: f7511ac497

Change-Id: I0bc49fd2385ef240f5fc477c01495148b4de319b