Merge remote-tracking branch 'toybox/master' into HEAD
am: 22656c7f1a

Change-Id: Id08a743096f735747109a2a7631debdd85e72d21