Merge "ONA: Enable new UI and connection flow." into oc-mr1-dev
am: f0653448fc

Change-Id: Idf8a2e6804a64186c97dbd34cf6f416e49d52bb5