Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1eb27c7f8ba7c0b6db8780b6af34084a6c151212