Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I0d1c8236e6eec991fca7ce1b309c862de896f81c