Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ic794e4e60c6823b6679d6b77bd9f96ef22738699