Merge changes I78d2dc79,I6e2eaebe
am: bb266150fe

Change-Id: I1d9afb8b0100f48fe1a75e27cdb1db5ad4e18f50