Android 5.0.0 release 6
merge in lmp-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51