Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ic7fcf708112cd21d3b31abe6384fe4b3478680ba