Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie41082b1449ada46c7c9bb3713e534f627ad0d58