Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 07f7d304 am: 6039d34f am: d460a21a am: a6f8fc61 Change-Id: I410a4a998256362e37345fa7836c8d3672c26017