Merge changes I4e13e5da,I68582cf0,I528a70cc
am: 01678299ce

Change-Id: I1bc454cbe71972b04c948c354ccaa7973831b5d0