Android CTS 5.1 Release 28 (4607396)
merge in lmp-mr1-release history after reset to lmp-mr1-dev