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