DO NOT MERGE: Test for bug 69478425 am: b4a4154558  -s ours am: 1ec1a39c8a  -s ours
am: 2da232e96e  -s ours

Change-Id: Ide41e94ee651c0168a0ef7cb3495581bedb24fba