Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I50f9b4da5ca273564059ef49b5dd3c031914c55d