am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
  sac template fixes