Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I697c759741900218cf938eb1f4f57b9f07d373f2