Bug: T221560 Change-Id: Ib38ab6334983eecea0981540d102ecde7fc94d42 (cherry picked from commit 693155fe2c653fbae781578fcb39d9888df5b2a3)