Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I2dd6a87b4a5ea59e4f04b4bd2c094500bdeae0d8