Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp * commit '15fe0e47958d248300c2f26a463172181b137aca': Allow soft AP settings config before bring up
Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp * commit '15fe0e47958d248300c2f26a463172181b137aca': Allow soft AP settings config before bring up