Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib940371ddeca0530ed8e279536cec5eb3e9ceed9