Android 5.0.0 release 7
merge in lmp-release history after reset to 090e63964316e93fb185eae398d126d8be3e7881