Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5017e17362a2838d0e89955cb984ee361a7ecb58