Merge "Guard initial URI use by OMC feature flag." into nyc-andromeda-dev
am: 1e13a68ee9

Change-Id: I75b5bddd185ab4cfb2e4452bf717cac3232ba97b