Description
This is a sub-task created for MB-42856. Please read the parent ticket for more information.
The parent ticket contains a changelist in gerrit that is not in the master yet for test/validation. We'll likely need to perform a synchronized check-in again.