Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I767c8cc8fd305c7b07fc9b4865a48b215d0aad5a