Merge "Fix issue #36858643: Runtime restart on OPR1.170323.002" into oc-dev am: 4bcc9bf0f2
am: 6aeb47b83d

Change-Id: Ic81ad08f8a00dffff3d8d14925da05d05418ed62