Merge cherrypicks of [9472870] into qt-release

Change-Id: I7d7a8c09fc3714f95677693ae27952cd217ced44