Android 5.0.0 release 4
merge in lmp-release history after reset to 7da67f69ace4281d5f8b1e5bc9c4a5ac52f5e43d