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

* commit '62649e91348ea1a2988b04ad4d6a4bff880c5fec':
  DO NOT MERGE Add SN logging