Merge changes from topic 'turn_on_supplicant_hidl'
am: 91de517046

Change-Id: Ib78bb986e69d329aeb1907caba538e2271096caa