Merge "Add PatchLineComments to RebuildNotedb"