Merge cherrypicks of [6991752] into studio-3.4-release

Change-Id: I9c0128a714edc9b8790691ddfb454a6ec36c0ccc