It should have been done long ago, but slipped my mind. Bug: T280435 Change-Id: I96c84c28217f436896654df6ea47019552af4faa