Merge "Merge "Merge "DO NOT MERGE: Test for bug 33137046" into lollipop-mr1-cts-dev am: fb43b21e52  -s ours" into marshmallow-cts-dev am: 4c1f6f8fdd  -s ours" into nougat-cts-dev
am: 105f175601  -s ours

Change-Id: Id389d398f33395daac32aa653d875ca0e73433d8