Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: I638c2d02a188abd603287690123e2ca1e0fa303f