Android 5.0.0 release 5
merge in lmp-release history after reset to 3342bbc2b87d0b8cd35edb34ac5e5b8b906c6a08