Merge changes I7d79aa90,Ie051e7d4
am: fedec90ec5

Change-Id: I18ed3948c9633a5f55b8604b36dfcc2ccb46004d