Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 07f7d30449 am: 6039d34fb0

Change-Id: Ifedc9c8825550bc5ec5c32c46d0cd0f48d016b5e