Android CTS 5.0 release 6
merge in lmp-release history after reset to 4b6f2e7a38c83c9bfa368c8aedef1cb5d91b7c8b