Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id6c3355c3d74776151c2709284c211932ce642e3