Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I7f6a2cb8c1efbf6fb668c3cb1424e4025a544f0c