[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a56215 am: 7e3864bc99
am: e53008bed5 -s ours
am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1 9cf3e7ae68 is in history

Change-Id: I0e7d646a5f4f5522df471df5ec921e63fff81a38