Android CTS 6.0 release 6
resolved conflicts for merge of e2c7d491 to master

Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525