Merge "Reduce OMS start time" into rvc-dev am: 84a84ac62a

Change-Id: If43e099fc76dbb86e9f7a3ac3b96c63ba8b63fa6