Android CTS 5.0 Release 9 (2991207)
merge in lmp-release history after reset to lmp-dev