Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I11e83d1c8124684d12ec6f829240a3cc371c07d7