Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib9685bda4ead9c9c4a19108d7c841a764845ad6f