Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I69f9160de84d541d1de8171a0cd1e6177a817f84