Android 5.0.0 release 4
merge in lmp-release history after reset to 388f3b9d233f1beccfcdcdbdaee068983dd0fa40