Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id8c68d4000043d7976b6130a09c40f5b7f7e850e