Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I4aa16709c0edf00353e2e6f011d04f2cf848f5bb