[Fixed] mantis 4849.

Change-Id: Iba059f4e154d6896cb2096cd5fb15b1651ee215c
Merge "[Fixed] mantis 4849." into unstable