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

Change-Id: I1399e0bd8a6ff26e8df2bfc7d4515e4dbb1d64e4