Push code for review

Change-Id: I85a4d1ae2c1197373bb38c28e328b9ac548e156c
Signed-off-by: eduowan <donis.wang@ericsson.com>