Update comments to note which ones are going into MWN
Change-Id: Ia0483e60b28690ca2f2ac65919063e3f9c810c6f