Bug: 112050583 Test: PoC Change-Id: I2ad3aceea38950b83f98819ede47538afb053ac0 (cherry picked from commit b31554e2) CRs-Fixed: 3155069