Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ib9d60cd990fd48d7496c340f5b2211c22e1d082b