Bug: 347114536 Test: unit test Change-Id: Ib5bd331e9a28e89e426bf423e6086d1c2d288961 Merged-In: Ib5bd331e9a28e89e426bf423e6086d1c2d288961 (cherry picked from commit 288b40ee4f)
288b40ee4f