Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I461bdf6afe2f9149a80105f0db73a608952972d3