Merge 5.1.1_r1 into lollipop-5.1