Merge cherrypicks of [9734155] into qt-aml-resolv-release

Change-Id: If526df5e745f0b0f6f3975355ac7cb3876af9271