Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I2a5df3f506f7f4c113df4e4f1bb76adc631cd618