Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id53e3396f8b33ef71d950363d51d2864535828f2