Merge changes If8c8d1f3,I3a804a9f am: 1fcefb0285 am: 20883ee618

Change-Id: I1a0085ad35ca95cab4086d4779ee15322094c2f6