DO NOT MERGE: Cherry pick CTS test fixes from mr1. am: 6b08198350  -s ours
am: ca2d1c6dcd  -s ours

Change-Id: I14255bd8fd97934b3231f86046a3570d8e8ad838