Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I860b06fbb065ff909f9e180edf1d84bbd332068a