am bdc748af: (-s ours) DO NOT MERGE: Eliminate StackBox.

* commit 'bdc748af8ce62778d2ad15040ecdfada6e4635fd':
  DO NOT MERGE: Eliminate StackBox.