Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iba7bb4a34fc51030e432e9ebef756aa4c01be76e