Merge cherrypicks of [5920355, 5926575] into qt-release

Change-Id: I3de7985c39d1cbc80b15d66210bcf84894a05de8