First round fix for b/17981558