DO NOT MERGE: CTS test for fix of b/65717533 am: d2f21642c2  -s ours am: 9117da41d1  -s ours am: 75e6f8acb1  -s ours am: 24e3200cf3  -s ours am: 0fd0b78c9f  -s ours am: 053cdb5dec
am: 2f1c9f6b78  -s ours

Change-Id: I5910d82dae6bf7e3d8409dac27a160e19d0ddf21