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

Change-Id: Ie2326fb0ed826db83c4c45d085331323ca88cf8c