References #1803: Backported fix to develop branch.

Change-Id: I25163c1ea0fa6cd43801928f57b0c14b499d76a6