Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3a56e00ba95d0d394fb239f8385e01715222087e