Merge changes If05d11a0,Ie67f0141 into android15-tests-dev

* changes:
  Polishing for migration to disable Weaver
  Support disabling Weaver on unsecured users