Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8ac89dbe7c9e6a3728866c35ec3e74aae6736585