Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Icadbeeb7299ad3d93c33be32009deddcae9e0a9b