Merge "DO NOT MERGE: Test for bug 33137046" into lollipop-mr1-cts-dev