related-to-bug: 5625690 (cherry picked from commit f8781452d9) Change-Id: Id27eb9052f00328ba04bac8486c9ed23f3c6a09b
f8781452d9