Merge "Do not pause scanning during Network state changes." into oc-mr1-dev am: 7b911fbdaf
am: e62793a173

Change-Id: I61b9a273c95bb99085882c06ea209685fedd8c48