Merge "DO NOT MERGE: Cherry pick CTS test fixes from mr1." into nougat-cts-dev
am: 571235b132  -s ours

Change-Id: Ie20de698203ca8ed56ffc21cfc47d4575096763b