Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Icab7f8c0a6e9a08449f9d06ac4404cb4f98a59a4