Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Idee7949f4d0f7b5160f2c3abd1a55c6a2646939f