Merge "Port the native scanner to cts_v2 bug:14792033" into jb-dev