Merge cherrypicks of [9022056, 9022057, 9022058] into qt-release

Change-Id: I8201a791c86aaab4ea57357e0a72aa10f4c675bc