Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ibf5539a33b14aba68b8117c31dc7f2148016e018