Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I59c06ab83a72545072b9d55c3e910142aeab75b8