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

Change-Id: I22efb7b39104720049cece72c4ffddfefef23b0f