Android 5.0.2 release 1
merge in lmp-release history after reset to a1f40f93fc1eb046a06683cafc62205a7ec6ca0c