renaming should not have been applied to third_party. Change-Id: I95be7ec4b7558298cd49ec4c5d1ed15a17ad222b