Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5d7ff8a6d1dc501cb117cc71de9e18b7f97e05b9