Merge remote-tracking branch 'toybox/master' into HEAD am: b5517d09b2
am: 0ab6910887

Change-Id: If2999e2badb59cc5fbb67b6ef57a7ee851516b0b