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