Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id0068a787569b6ab6c004d77ea3fc0d3c4d645d5