Android CTS 5.0 release 4
merge in lmp-release history after reset to 1b02ce54d26449c8fe2ad760e039a9d8695b3038