Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I2e6309e073cd1dbf9a863c3fd45277b0c25571c1