Change-Id: Icd58c2efee140bdd04cb9abb3f34751f5f893ee1
Reviewed-by: hjk <hjk121@nokiamail.com>