Merge changes I99614045,Ib6f66b2b into marshmallow-cts-dev
am: 5c58c28144

Change-Id: Id8763c6ac28144866cbf451950e7c39990b20551