Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib6d968cf6f00682a6cede8369b35e871ade05adf