Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8663cfecf8bc6a68337b44df489e0e0641dbef74