* Fix it during extraction. * Since we moved to py extract utils, adding patches does the job. Change-Id: I7f56ecaac51abb6525c6022d92eac1c285ab0688