Resolved bug #1191877

Change-Id: I4910629a3eac6865078d37b857bd2410535d52c0
Merge "Resolved bug #1191877" into release-0.1