Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I280e6645156b4fdda8c0d8ebe344f23ddc6ba650