Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Idaa6c9b2eee54c727b0c73dbe138e7b05c30ce35