Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8fdeadde3a5f66eef2ca1b3a89960f9441c98eed