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