Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I460c2236ef735ec855c97c74847376ba2681c151