Merge changes I4d6bda45,I72576e1f am: 6c4cfd6af5
am: 479627b823

Change-Id: Ia976c1e1447b7277a4cf1e9e0af2b6651719f268