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

Change-Id: I69e6b412f150419baa9dc1860d190d85bfdfc47d