Merge remote-tracking branch 'toybox/master' into HEAD am: 7a49753b15
am: b3174baf1e

Change-Id: If88369ae132c8069d59266947626780a01962f5c