Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I0277a9ade1e78218c7b03d3f640781df23db4235