Fixes Bug 59218

Change-Id: Ia6291dd5cd9916d8152b59110d4b12755d06665f