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

Change-Id: I4c27a3fe1fadd432b39762d00583054e1e663ceb