Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I8d3fd5946665e81fbe9d82bcc9b90d7c54099fd6