Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: If9076ac14789a04b94a0f33e3ae671c01298f673