model manager issue

Change-Id: I9c0ea8f5ad975c3a2f2ad83ff5d9e59bb28626cc
Signed-off-by: Lisa Song <lisa.song@sap.com>