Merge remote-tracking branch 'toybox/master' into HEAD am: 180f3c7f4b am: cfd9a11e48
am: 145bcb8708

Change-Id: If36790fa0a0539b95937f07a46fa0071a8cdaf93