Update to reflect https://github.com/flutter/flutter/pull/11751 and https://github.com/flutter/website/pull/663