Fix some identation and Wifi AP

Change-Id: I12f2b75ef00fc3c979ae4ed24a2eac632b129380