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