Merge "Merge lollipop-mr1-cts-dev revision 915fdb6a into marshmallow-cts-dev." into marshmallow-cts-dev