Fan Zhang
authored
Bug: 32426306 Test: Manual, and added unit test Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a (cherry picked from commit e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6) (cherry picked from commit c9cdc25f4110a4e2224890f81f3be77c604ae536)