Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id06cc594fd10854bd863ec3f0fe17e96dd595f07