fixes b//17203523