Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a56215
am: 7e3864bc99

Change-Id: I45112b415f0f1d6a991b65a2f87c04f829a13548