Merge changes I63ac5405,Id3d3704f,Ia3152f48,Idddd4e8a
am: c8474562ce

Change-Id: Id24ee764b6d819f400b4af0895d4be530f608296