Fix compiler locking diagnostic warnings.

PR:	194289