DO NOT MERGE Allow extension version 9 Bug: 294222609 Change-Id: I441ee7d6475d56deb7d3a2eccc4f09a274aa7fde