Resolved Bug #1186804

Change-Id: Ia8a9fa75f53c46ffa31d91c5e384a4d6cccc0063
(cherry picked from commit f7cc618b095f2d18e464ce5059c5a1d65ac85094)