Fix for issue 16736964

Change-Id: If150db98346fe10f62fc1160309b66d7a19e9022
1 file changed