Merge "Post HH rc1 bump of distro config"