Bug: 112587252
Bug: 114073652
Test: This is to fix the tests.
Change-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de
Merged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de
(cherry picked from commit 5f5ad2e627)
Bug: 112587252
Bug: 114073652
Test: This is to fix the tests.
Change-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de
Merged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de
(cherry picked from commit 5f5ad2e627)