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