Change needed for MBL-10483 (MobileSprint317).