Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id93fd29ca58e92fcde87904b176f544df5c9a428