Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev am: 27cd1f7e20
am: 59cad0052d

Change-Id: If5046509aed94fb6f006644f52e6446fd96fbf74