Bug: 229771520 Test: Automated Change-Id: Ia5b4dfe38d48a41cbfb59109c819647b9e8398cf (cherry picked from commit e3004a6e) Merged-In: Ia5b4dfe38d48a41cbfb59109c819647b9e8398cf