Merge changes from topic "cherrypicker-L19600000954488498:N18900001264327475" into tm-dev

* changes:
  Address leftover comments
  Test [set|get]AppExclusionList