Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id25e58facce91bd9c22ba5e6658db8ba93ac51c0