am 6ae77cfb: am f4e557c9: am 94af6d9e: Merge "Make unit test independent from test device locale"
* commit '6ae77cfb2d0d746292ee8bc74032bbe276230c91':main
commit
88a70d59c2
* commit '6ae77cfb2d0d746292ee8bc74032bbe276230c91':main