Update with cherry-picks

Change-Id: Idd885d23daf9cb4c2f00fbb9dd132e8efb10a6f8