Commit 00a00bc1f23c681d64fbd4df33582ec0165e337a

Behdad Esfahbod 2019-04-24T10:01:30

Fix two TODOs