Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie811908570953531ac79211aa5e8b412e3cdc288