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