Merge changes I45978ea4,Ia85b1008,I9e68c561,I9255dd3c
am: 888e6b1499

Change-Id: I533b1c0f787491bdc7566f9cfc6b64b3285918b8