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

Change-Id: I574b525b90709c3f1256c60a5f0dfb41b6c4c69a
tree: 1f65758b4694ad5f8e722c72a95829e43b12d3b6
  1. tests/