bug: 22507076 Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382 (cherry picked from commit d7d413ad)