Commit c221dc0ba70fd4af94d8f735a9cef1ab92cc6ede

Behdad Esfahbod 2018-11-14T14:49:34

[ot-shape] Move code around