Bug: 112050983 Test: PoC Change-Id: I5d331f46cdba86c8e61de206a2ede1d2b348d7e4 (cherry picked from commit 230f252b) CRs-Fixed: 3155069