Merge "DO NOT MERGE: Test for bug 33137046" into marshmallow-cts-dev
am: c66c5aba39  -s ours

Change-Id: I0fa8117a19d95b10e5a00cf8f1e234aa0212b3e1