Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I15cc3834db7be4efe154a38010e09ce83eeb66b0