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

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