Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8991be43dc5a9280b4074311c2710b0c2cb65c5f