Merge "Shell: Allow retrieval of wifi network credentials" am: 619cd57c1f

Change-Id: Ie30029475332213e1c5a80ff003b02390d35b58e