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

* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
  sac template fixes