Merge branch 'stable-3.9' into stable-3.10 * stable-3.9: Make the local test environment more realistic Change-Id: I2b3fc30426c4a518da649dc73711f4b8fbc19ad8