Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie5a291b2a241c1293c7da7810c176e538cbec69a