DO NOT MERGE Add SN logging am: 24cd2b9627 am: ec7538a254  -s ours
am: aaeceb2379  -s ours

* commit 'aaeceb2379957791f7a78b441c23c55535a7ba43':
  DO NOT MERGE Add SN logging