DO NOT MERGE Add SN logging am: 24cd2b9627 am: ec7538a254  -s ours am: aaeceb2379  -s ours am: 828f6f1489 am: ccc5d9a0f7  -s ours am: 62649e9134 am: a3def43d3c am: 80bf31c686
am: 18737dc9aa  -s ours

* commit '18737dc9aab0f84db50c81f2f245f500f98767dd':
  DO NOT MERGE Add SN logging