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

Change-Id: I5e57d84884676af7640d7ccb8c7d1d489184248d