Merge \"WCM: reset connectivity scan retry counter\" into nyc-mr1-dev
am: a780a159b7

Change-Id: I52a810c8e7bfd0619ddb6679c5c97c6bab319619
tree: 6b5305ef3eb35cb04f461fec1e8533bd2f3f8e18
  1. service/
  2. tests/