Merge changes I5bfdcf90,I32b0ed5c into marshmallow-cts-dev am: 53e358786c am: 2f6b2051e8 am: 9f59f3a295 am: 2b49724409 am: d240fcfc05 am: 122c5f4cb9 am: e438cbcb1a am: a9c648d716
am: 2274ea51c4

Change-Id: I996c4173c82de6aea26fee81610ec6a541de2141