Merge "Fix a few minor bugs."
tree: e3eb366a02fcba6e80fb87bb5e3c3c3c41f15de5
  1. BUILD
  2. LICENSE
  3. OWNERS
  4. src/