DO NOT MERGE: CTS test for fix of b/65717533 am: d2f21642c2  -s ours am: 25ce0c5877 am: e1fbedf930 am: bffcbe8400 am: 49c383780f  -s ours am: 4cfab66f1f am: 344db9bc15 am: fe7d1b7539 am: 96c98b9044 am: 68d09c2650  -s ours am: 552c68cd1a am: a3d69c68d9 am: b5fad2f884
am: 442af4cc55  -s ours

Change-Id: I68ff0f72016c99bb9b47c7e9861db6a66a019e29