Merge "Fix up comments NotifListBuilderImplTest"