Fix for regression which made issue 14491953 occur more easily

Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb
(cherry picked from commit 327acfea13d924293b88c7d204fde4a25748108d)
2 files changed