Merge "Cleanup leftover commented code." am: 89268e42f2 am: b25f6777cc
am: 20a3ee1b0b

Change-Id: I574b525b90709c3f1256c60a5f0dfb41b6c4c69a