Merge "Fix so that dual access points (AP) works." into qt-dev am: 87592de6f2
am: dd12f40157

Change-Id: Ibbe85dff581fb553e59e47d711fc4b402a9d06bb