Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Icfce1ebd3ca6a839d649fb63507ca461d6f82ea4