Merge "[pm] do not preserve abi override on update"