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