Merge changes from topic "am-3c49710481db4493bb49aed4bfa2e706"

* changes:
  Merge "[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod am: ff4461ae -s ours" into tm-dev am: 67a2b2a9 -s ours am: 644ca242 -s ours am: c68e54f0 -s ours
  [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod am: ff4461ae -s ours am: 7644b13b -s ours am: e830b6ad -s ours am: d77db7c2 -s ours