Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3452a6ecdfee2fffd53835a0259d58b762bc90a5