Android CTS 6.0 Release 15 (3666707)
resolved conflicts for merge of 46ea63c7 to lmp-dev

Change-Id: Icd0fcdd90df854d5c74ace9732636a10e215074d