Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5e837807d013584b2fd815aabf8f97864c5aaf12