Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1f84faa617cf30a8c259dc1790bd96300857f662