Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ia4828cd1b338b99db454661de9cb8359629c5bf1