Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1753a6211411ee253a8ab3362c3ac252c1ebca6e