[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: ce6618e8 am: 31f20d99 am: bf7a2fc1 -s ours
am skip reason: Change-Id I1f279fadd8c543b845fce0f13dc62c1480757692 with SHA-1 d44b4efa is in history
Change-Id: I3bd88c4ca0dad7ca513ba96f3c3a379f53c39f8f