Android CTS 5.0 release 4
merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0