Merge "Adds official comment support to the whitelist format." am: e999df1b2a

Change-Id: If8c72d3b0b428cfbf77adc3feedf988695956c7d