Changes to match the two latest commits in the platform code.