Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I1bfeb0d9aa9e441e0962baf17b8f9b28dfc206b3