Merge branch 'android-5.0.1_r1' into HEAD

Change-Id: I0eb984811f335cb5fbcbbfc9b6556a349049b070