Merge changes from topic "cp-networkscan" am: 7687477742

Change-Id: Id9dac13a2f325d71ebf436f261239b76fbfd1cfa