Merge changes I25465f6d,I55d4b4e3,I0bb11de7,Ibb76bd59,I7bf782fa
am: 3dffcb17b3

Change-Id: I7b2e82ad64e56f859741eb06f0e9e05b0a1aafe1