Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I833bff2f3b3064c2dbbba2f05cb4faef31fca11e