Adding workaround for regression caused by ag/752175

Change-Id: I92617c88f17a5827454e147f93d822975587d5b4
1 file changed