d14c7265f1
Fixes an issue with model based update that got into the original patch that was merged. Change-Id: Ie42d3d0aff2e48cd187d96664dbd3e9d6d3ac22f