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

Change-Id: I5b85a9b3476d46ab6060bdefb08bcf459abddac6