Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ic245286a06da1d644fc7f2b57a96138b2f1a75c7