Merge changes I768f0948,I3d79bb35 am: 2474ba9744
am: 2f5f475c3e

Change-Id: I1da4a3a88c893d8ed5359e4b985a9e8ae9774535