Hack fix for b/10709572.

Change-Id: I56582ca84cbe76539078eb5fdc39edd0480178b7
3 files changed