Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5545ad006bb6a62afb648188f5643ae4425214ea