[fix] Mantis Bug# 4280

Change-Id: I59d424d6e7323b9de3f2e161b915ccc018476730
Merge "[fix] Mantis Bug# 4280" into unstable