Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1bc3ca44ee58ffd16ce2bb13d8c88dbea391662c