Merge changes If8c8d1f3,I3a804a9f am: 069d78ccce am: b42c3d86b5

Change-Id: I1a0085ad35ca95cab4086d4779ee15322094c2f6