Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1ce121d46dbf31778881e0f573c585c22063ee43