Merge "Update the string values for the error message while network scan." into pi-dev
am: 427c890d0e

Change-Id: If58b8e07c9b82c603440ad9dbd98eb1f6b02884b