[automerger skipped] Merge changes from topic "cp-networkscan-optimize" into...
[automerger skipped] Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c7 am: 600d65a5 -s ours am: 45433b25 -s ours
am skip reason: Change-Id I1f279fadd8c543b845fce0f13dc62c1480757692 with SHA-1 c058cac0 is in history
Change-Id: I8669ef9ce30e525de98fb9578f497ace1abed7ce