Merge "Lose df to toybox." am: 0fd0946393
am: df2f91ceb7

* commit 'df2f91ceb7030433b15713ce6cca48bcba1a8c3f':
  Lose df to toybox.