Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id8808a237674627321a87b925ed86699fdfdea30