Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I3a846fb8ce87ec47d8896cb965797157f284e84d