Remove leftover commented out code.
am: fc8febc888

Change-Id: I3c244d2b1c00ab69a5a4e9dedacac586fa7b70fa