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

* commit '828f6f1489f546da0ebccd929dd3b819f9d45efd':
  DO NOT MERGE Add SN logging