Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ifdcfa13ad852e4474520218ff592e2702421c42a