Merge "Clean up comment"
am: 8cdc0da9ad

Change-Id: I8fde53a8d460309a2efb69a7d15e2665dd75e432