Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I0020bac94a9a195a94802b346055c8690a3413ac