Merge "Cleanup leftover commented code." am: 89268e42f2
am: da8ad481d3

Change-Id: I6f0c705a51130288d2bb42f401baf8116f4b00dc
tree: 8e06d37f06b0854e2c34601af693fc02c6166a2b
  1. tests/