As explained on phab, and add a script to fix broken entries. Bug: T231131 Change-Id: I95d70acb936b5ca987af8f237d236fe47b663919