Keeping those tags in sync will reduce merge conflicts downstream. BUG:23120831 Change-Id: I84bbc5b9dc0bf9e57257c535e6f882c7a5bf7c5b