Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I81c8ae51ebfc0b048b6c180660b3ee8491195ce2