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