Revert "resolve merge conflicts of 2537ffdefc to marshmallow-cts-dev"
am: 48850d1d57  -s ours

Change-Id: Ia0bb87f5a1dde2ad014d2e91bddf1a00b3a9e6dc