Android CTS 5.0 release 3
merge in lmp-release history after reset to lmp-dev