Merge changes from topic 'turn_on_supplicant_hidl' am: 91de517046
am: ec4c129044

Change-Id: Iebda109889e8c26c42ff1750fc3165bf27e901e1