Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I6773b6beb0a3b37410c39a16bfcd203d5a13c435