diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js
index 6811e1731b4..13286b59676 100644
--- a/assets/src/block-editor/helpers/index.js
+++ b/assets/src/block-editor/helpers/index.js
@@ -66,11 +66,9 @@ const ampLayoutOptions = [
 		],
 	},
 	{
-		// Not supported by video.
 		value: 'intrinsic',
 		label: __( 'Intrinsic', 'amp' ),
 		notAvailable: [
-			'core/video',
 			'core-embed/youtube',
 			'core-embed/facebook',
 			'core-embed/instagram',
diff --git a/bin/ci/after-wp-install.sh b/bin/ci/after-wp-install.sh
index f3a6f808923..78d021a8fdf 100755
--- a/bin/ci/after-wp-install.sh
+++ b/bin/ci/after-wp-install.sh
@@ -39,7 +39,7 @@ fi
 if [[ -n $INSTALL_PWA_PLUGIN ]]; then
 	echo -n "Installing PWA plugin..."
 	wget -O "$WP_CORE_DIR/src/wp-content/plugins/pwa.zip" https://downloads.wordpress.org/plugin/pwa.zip
-	unzip -d "$WP_CORE_DIR/src/wp-content/plugins/pwa/" "$WP_CORE_DIR/src/wp-content/plugins/pwa.zip"
+	unzip -d "$WP_CORE_DIR/src/wp-content/plugins/" "$WP_CORE_DIR/src/wp-content/plugins/pwa.zip"
 	echo "done"
 fi
 
diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index f28f1d56541..a21e08f35d4 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -15,7 +15,7 @@
  */
 class AMP_Allowed_Tags_Generated {
 
-	private static $spec_file_revision = 1095;
+	private static $spec_file_revision = 1119;
 	private static $minimum_validator_revision_required = 475;
 
 	private static $descendant_tag_lists = array(
@@ -555,6 +555,10 @@ class AMP_Allowed_Tags_Generated {
 			'vkern',
 			'wbr',
 		),
+		'amp-story-player-allowed-descendants' => array(
+			'a',
+			'span',
+		),
 	);
 
 	private static $allowed_tags = array(
@@ -1480,6 +1484,7 @@ class AMP_Allowed_Tags_Generated {
 							'',
 						),
 					),
+					'prefetch' => array(),
 					'query' => array(),
 					'src' => array(
 						'value_url' => array(
@@ -4707,6 +4712,37 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-onetap-google' => array(
+			array(
+				'attr_spec_list' => array(
+					'data-src' => array(
+						'mandatory' => true,
+						'value_url' => array(
+							'protocol' => array(
+								'https',
+							),
+						),
+					),
+					'media' => array(),
+					'noloading' => array(
+						'value' => array(
+							'',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'amp_layout' => array(
+						'supported_layouts' => array(
+							1,
+						),
+					),
+					'requires_extension' => array(
+						'amp-onetap-google',
+					),
+					'unique' => true,
+				),
+			),
+		),
 		'amp-ooyala-player' => array(
 			array(
 				'attr_spec_list' => array(
@@ -5764,6 +5800,11 @@ class AMP_Allowed_Tags_Generated {
 		'amp-story-360' => array(
 			array(
 				'attr_spec_list' => array(
+					'controls' => array(
+						'value' => array(
+							'gyroscope',
+						),
+					),
 					'duration' => array(
 						'value_regex' => '([0-9\\.]+)\\s*(s|ms)',
 					),
@@ -5779,6 +5820,15 @@ class AMP_Allowed_Tags_Generated {
 					'pitch-start' => array(
 						'value_regex' => '-?\\d+\\.?\\d*',
 					),
+					'scene-heading' => array(
+						'value_regex' => '-?\\d+\\.?\\d*',
+					),
+					'scene-pitch' => array(
+						'value_regex' => '-?\\d+\\.?\\d*',
+					),
+					'scene-roll' => array(
+						'value_regex' => '-?\\d+\\.?\\d*',
+					),
 					'zoom-end' => array(
 						'value_regex' => '\\d+\\.?\\d*',
 					),
@@ -5794,12 +5844,12 @@ class AMP_Allowed_Tags_Generated {
 							3,
 							7,
 							1,
-							4,
 						),
 					),
 					'child_tags' => array(
 						'child_tag_name_oneof' => array(
 							'amp-img',
+							'amp-video',
 						),
 						'mandatory_num_child_tags' => 1,
 					),
@@ -6152,21 +6202,39 @@ class AMP_Allowed_Tags_Generated {
 		'amp-story-interactive-results' => array(
 			array(
 				'attr_spec_list' => array(
+					'chip-style' => array(
+						'value' => array(
+							'flat',
+							'transparent',
+						),
+					),
 					'option-1-image' => array(),
 					'option-1-results-category' => array(
 						'mandatory' => true,
 					),
+					'option-1-results-threshold' => array(
+						'value_regex' => '\\d+[.\\d+]?',
+					),
 					'option-1-text' => array(),
 					'option-2-image' => array(),
 					'option-2-results-category' => array(
 						'mandatory' => true,
 					),
+					'option-2-results-threshold' => array(
+						'value_regex' => '\\d+[.\\d+]?',
+					),
 					'option-2-text' => array(),
 					'option-3-image' => array(),
 					'option-3-results-category' => array(),
+					'option-3-results-threshold' => array(
+						'value_regex' => '\\d+[.\\d+]?',
+					),
 					'option-3-text' => array(),
 					'option-4-image' => array(),
 					'option-4-results-category' => array(),
+					'option-4-results-threshold' => array(
+						'value_regex' => '\\d+[.\\d+]?',
+					),
 					'option-4-text' => array(),
 					'prompt-text' => array(),
 					'theme' => array(
@@ -6289,11 +6357,7 @@ class AMP_Allowed_Tags_Generated {
 							4,
 						),
 					),
-					'child_tags' => array(
-						'child_tag_name_oneof' => array(
-							'a',
-						),
-					),
+					'descendant_tag_list' => 'amp-story-player-allowed-descendants',
 					'requires_extension' => array(
 						'amp-story-player',
 					),
@@ -6577,6 +6641,7 @@ class AMP_Allowed_Tags_Generated {
 							2,
 							3,
 							7,
+							9,
 							1,
 							4,
 						),
@@ -6690,6 +6755,7 @@ class AMP_Allowed_Tags_Generated {
 							2,
 							3,
 							7,
+							9,
 							1,
 							4,
 						),
@@ -9580,7 +9646,6 @@ class AMP_Allowed_Tags_Generated {
 						'disallowed_value_regex' => '__amp_source_origin',
 						'mandatory' => true,
 						'value_url' => array(
-							'allow_relative' => true,
 							'protocol' => array(
 								'data',
 								'http',
@@ -9593,6 +9658,7 @@ class AMP_Allowed_Tags_Generated {
 				'tag_spec' => array(
 					'mandatory_ancestor' => 'noscript',
 					'mandatory_ancestor_suggested_alternative' => 'amp-img',
+					'spec_name' => 'noscript > img',
 					'spec_url' => 'https://amp.dev/documentation/components/amp-img/',
 				),
 			),
@@ -12818,7 +12884,6 @@ class AMP_Allowed_Tags_Generated {
 							'0.1',
 						),
 					),
-					'spec_name' => 'amp-ad-custom extension .js script',
 				),
 			),
 			array(
@@ -15212,6 +15277,36 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'async' => array(
+						'mandatory' => true,
+						'value' => array(
+							'',
+						),
+					),
+					'crossorigin' => array(
+						'value' => array(
+							'anonymous',
+						),
+					),
+					'nonce' => array(),
+					'type' => array(
+						'value_casei' => array(
+							'text/javascript',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'extension_spec' => array(
+						'name' => 'amp-onetap-google',
+						'requires_usage' => true,
+						'version' => array(
+							'0.1',
+						),
+					),
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'async' => array(
@@ -15995,7 +16090,7 @@ class AMP_Allowed_Tags_Generated {
 						'name' => 'amp-story-interactive',
 						'requires_usage' => true,
 						'version' => array(
-							'1.0',
+							'0.1',
 						),
 					),
 				),
@@ -16460,7 +16555,6 @@ class AMP_Allowed_Tags_Generated {
 							'0.1',
 						),
 					),
-					'spec_name' => 'amp-video-docking',
 				),
 			),
 			array(
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 8ba06476f0d..dd18b25c790 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -524,7 +524,7 @@ static function () {
 							<amp-story-page id="my-second-page">
 								<amp-analytics config="https://example.com/analytics.account.config.json"></amp-analytics>
 								<amp-story-grid-layer template="fill">
-									<amp-story-360 layout="responsive" width="100" height="100" heading-start="-45" pitch-start="-20" heading-end="95" pitch-end="-10" zoom-end="4" duration="30s">
+									<amp-story-360 controls="gyroscope" layout="fixed" width="100" height="100" heading-start="-45" pitch-start="-20" heading-end="95" pitch-end="-10" scene-heading="0.00" scene-pitch="0.00" scene-roll="0.00" zoom-end="4" duration="30s">
 										<amp-img src="img/panorama1.jpg" layout="fixed" width="200" height="100" crossorigin="anonymous" referrerpolicy="origin"></amp-img>
 									</amp-story-360>
 								</amp-story-grid-layer>
@@ -559,6 +559,7 @@ static function () {
 								<amp-story-grid-layer template="fill">
 									<amp-story-interactive-poll id="correct-poll" endpoint="https://webstoriesinteractivity-beta.web.app/api/v1" theme="dark" chip-style="shadow" class="nice-quiz" prompt-text="What country do you like the most?" option-1-text="France" option-1-confetti="🇺🇾" option-1-results-category="Dog" option-2-text="Spain" option-2-confetti="🇺🇾" option-2-results-category="Cat" option-3-text="Uruguay" option-3-confetti="🇺🇾" option-3-results-category="Bunny" option-4-text="Brazil" option-4-confetti="🇺🇾" option-4-results-category="Mouse">
 									</amp-story-interactive-poll>
+									<amp-story-interactive-results prompt-text="Your level is" option-1-results-category="Beginner" option-1-image="beginner.png" option-1-results-threshold="10" option-2-results-category="Expet" option-2-image="expert.png" option-2-results-threshold="80"></amp-story-interactive-results>
 								</amp-story-grid-layer>
 							</amp-story-page>
 							<amp-story-page id="amp-story-interactive-binary-poll">
@@ -663,7 +664,7 @@ static function () {
 			],
 
 			'amp-video'                                    => [
-				'<amp-video width="432" height="987" src="/video/location.mp4"></amp-video>',
+				'<amp-video width="432" height="987" layout="intrinsic" src="/video/location.mp4"></amp-video>',
 				null, // No change.
 				[ 'amp-video' ],
 			],
@@ -2318,7 +2319,7 @@ function getRemoteData() { /*...*/ }
 			'amp-autocomplete'                             => [
 				'
 					<form method="post" action-xhr="/form/echo-json/post" target="_blank" on="submit-success:AMP.setState({result: event.response})">
-						<amp-autocomplete id="autocomplete" filter="substring" min-characters="0" inline="@" max-items="10">
+						<amp-autocomplete id="autocomplete" filter="substring" min-characters="0" inline="@" max-items="10" prefetch>
 							<input type="text" id="input">
 							<script type="application/json" id="script">
 							{ "items" : ["apple", "banana", "orange"] }
@@ -2959,6 +2960,12 @@ class="slide"
 					AMP_Tag_And_Attribute_Sanitizer::SPECIFIED_LAYOUT_INVALID,
 				],
 			],
+
+			'amp-onetap-google'                            => [
+				'<amp-onetap-google layout="nodisplay" data-src="https://rp.com/intermediate"></amp-onetap-google>',
+				null,
+				[ 'amp-onetap-google' ],
+			],
 		];
 	}
 
diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php
index 62167b15ee0..caae1d06067 100644
--- a/tests/php/validation/test-class-amp-validation-manager.php
+++ b/tests/php/validation/test-class-amp-validation-manager.php
@@ -1672,6 +1672,11 @@ public function test_has_parameters_passed_by_reference() {
 	 * @throws Exception If assertion fails.
 	 */
 	public function test_decorate_shortcode_and_filter_source() {
+		global $post;
+		if ( empty( $post ) ) {
+			$post = self::factory()->post->create_and_get();
+		}
+
 		AMP_Validation_Manager::add_validation_error_sourcing();
 		$shortcode_fallback = static function() {
 			return '<b>test</b>';
@@ -1877,9 +1882,11 @@ public function test_decorate_shortcode_and_filter_source() {
 
 		$source_json = wp_json_encode(
 			[
-				'hook'    => 'the_content',
-				'filter'  => true,
-				'sources' => $sources,
+				'hook'      => 'the_content',
+				'filter'    => true,
+				'post_id'   => get_the_ID(),
+				'post_type' => get_post_type(),
+				'sources'   => $sources,
 			]
 		);