Merge "Fix testResNApi in MultinetworkApiTest" into qt-r1-dev am: 16a47029ed
am: bb2b69027d

Change-Id: Ic94095c7420b4baee78051f06efd943ea9fe1ee1