BUG: 68248250 Test: Local build Change-Id: Iad3990613a1a1b93e6450096a790d23790c28030
mentioned in commit 1b77e423