FPII-1823: Merge conflict--Add SN logging

Merge conflict--Add SN logging

Bug 27046057

Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
(cherry picked from commit 2d3f6d28e08a8168dad946cb45c4b4d662739391)
1 file changed