Merge "Fix DtmbFrontendSettings annotations."