am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine