Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I4c7caddcd9fa6f35538996afe13c00c2ea7c2ab0