resolve issues for ecrm Change-Id: I0d60c120e1d4dac7a6d2e83a235c089a51b4dd91
mentioned in commit 9a53eb9c