Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-03-15 0883f3177bac1dc56d912c16cdf0cff6efc606e6

1
2
3
4
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
    <base-config cleartextTrafficPermitted="true"/>
</network-security-config>