Merge cherrypicks of [9343899, 9344500] into qt-aml-patch-release

Change-Id: I1979146f055e1d60f513d6c6dc9387f5f7bcddc0