Merge cherrypicks of [9732513] into qt-aml-networking-release

Change-Id: Iac8b654754b430784d4f8f4e983d3daefe65c20a