Merge "Hide entire hidden field for non-hidden networks" into pi-dev
am: 2c793dfeff

Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2