Bug: 136220871 Test: TBD Change-Id: Ia639dd01081218db0bc3029316a58a03b9d4d927 (cherry picked from commit 7a4f1d23) Merged-In: Ia639dd01081218db0bc3029316a58a03b9d4d927