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