Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I706f3f3215d036828ee44808046bafe7a8b0fd7e