Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3c99bf4440205917238a64d91d5ae07e558b9eac