Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I92de070a286fc79da057be139cb5287dd8f40883