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

* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
  sac template fixes