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