Merge "Remove leftover commented out code."
am: 3399853809

Change-Id: I7895a378abf355ad7db33033cf54d87009d464a8