Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I866372554efb330f5c88913b9105bac59f3fef1f