Appears to need same fix as If0117511497ee1457e63d2710f1c3e29f4f44bc0

Change-Id: Ibdc0e3db56849b8bd2115a1880dd9d22f5a464db