Android CTS 5.0 Release 7 (2906672)
merge in lmp-release history after reset to lmp-dev