Shrink-wrapping model to spec (issue 10397399)

Change-Id: I87e32e8bd93f3b0468bc840200faed8270922a03
3 files changed