Merge "Cherry-pick 'Update the string values for the error message while network scan'"
am: 2175f24ce4

Change-Id: I1be9bb321f23a44a42e53f0f5cb5de379dd5ff85