Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1a804f3efc8f107d883ac6c2bb610cc9cac7ad25