Merge "Move Wifi Ap configuration to flat file" into gingerbread