Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbd am: 55ddb99527
am: 66ca192ac3

Change-Id: I751dbb8fd9a5b5f79118ce38a63d2b5073bb5bf7