Android 5.1.1 release 8
merge in lmp-mr1-release history after reset to a1f40f93fc1eb046a06683cafc62205a7ec6ca0c