Bug: T384879 Change-Id: I439d000515198e43f65a13f8676cadb21ee65d28 (cherry picked from commit 55ad2b22e9b1339f5c0405b5bf4fc1afc0f11952)