Merge "Added TODOs for two unused #defines"