This is cleaned up as of commit
2351d624aed7aae9d58ce37676c0181687be0e8a, and should be sufficient for
the final release. If something else with a release note lands, we can
make any changes there in a later patch.
Change-Id: Ia1ef442f3cc0d64c8a7c6fbb5aaf3f0160f214de