Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I02036b14ac031229296946693bcabce8e3c14dab