Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I84643e8b2be37f690c56bea8b7f87c2a1d96089b