Merge changes I5c3e1625,I51fc5cb2 am: 3eb4eee4c9

Change-Id: If3d68b5bf5ea561b2788e263b6ffcc3f2b8a84f7