[Fixed] mantis 2842

Change-Id: I12bb0f81d5b638cc992ccd4a94fee679d144dc7f
Merge "[Fixed] mantis 2842" into unstable