Merge changes If56cc9f1,I95bfcb59,I62021e0f am: 0ec224dd69 am: 8983e9ef36
am: cb3c124db7

Change-Id: I8347c3aed91f7208d9a81ec9eb4e12ef7e5673b1