Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: If36d105a7f485b5e660eac46909a5f8b64cb6483