Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I9da0a0fb24a2a0c1fe29bb6e77537454be86732e