Not working yet. Change-Id: I87bd15d8c4aee491404b57842884220103a63e1f Reviewed-by: hjk <hjk121@nokiamail.com>