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

Change-Id: I3e66aca67046626b765b37b8b185961afed8e1e5