Merge "Fix build breakage from missing close brace." into lmp-mr1-dev