Merge "Fix issue with configuration update check." into oc-dr1-dev am: 8aaa5adae6
am: d55ae0fd75

Change-Id: I26f4127e5d132f84d5963a7f520a19e593dcd235