Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I77f1739f906a0a4078508da37456179f2383bbf1