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