Merge "cts: Add few targets to whitelist in the CTS test case" am: 8ca603519c am: 4f240bb029

Change-Id: I6d7c345d94a507578bb945e60960b4fa756afb4e