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

Change-Id: I242d4796e7b74e720daebbf274c849eb37100c03