Merge changes I768f0948,I3d79bb35
am: 2474ba9744

Change-Id: I04aec22a4eefac8439e101a6f28817e4f90b7bc9