Resolved Bug #1186804

Change-Id: Ia8a9fa75f53c46ffa31d91c5e384a4d6cccc0063