am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '4a02e0716d43bd2bf9b96a8b1dae181f9c35dcbf':
  Move options buffers to top scope