Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.common.frexp.*
Change-Id: Ic725c53191c3a6ec6494859d6eb8e6a8eb77c90e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28628Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

- GLSLstd450PackSnorm4x8
- GLSLstd450PackUnorm4x8
- GLSLstd450PackSnorm2x16
- GLSLstd450PackUnorm2x16
- GLSLstd450PackHalf2x16
- GLSLstd450UnpackSnorm4x8
- GLSLstd450UnpackUnorm4x8
- GLSLstd450UnpackSnorm2x16
- GLSLstd450UnpackUnorm2x16
- GLSLstd450UnpackHalf2x16

Test: dEQP-VK.glsl.builtin.function.pack_unpack.*
Bug: b/126873455
Change-Id: I0c765bc215d43f894cad91c7ee06b5e3af3f75db
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28433Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

dEQP has no test coverage for this. Filed VK-GL-CTS #1728 to fix that.

Bug: b/126873455
Change-Id: I69524d0f4d5d15356eedd105645637af1a4f0f0f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28608Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.common.modf.*

Change-Id: Icefc1f7241aa1b3ef253b9f5775c38a424afec77
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28569
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Moved the generic Transform Feedback buffer out of the local Transform
Feedback Object (TFO), and into global state.

Bug chromium:818098
Tests: dEQP-GLES3.functional.state_query.indexed.transform_feedback_switching_buffer
Change-id: Ife86cc82bd57c33b9daec4870610b5eaea5c2f52
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28436
Presubmit-Ready: Sean Risser <srisser@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Sean Risser <srisser@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Added support for using the ImageView's format
to perform clear operations.

Bug b/119620767

Tests: dEQP-VK.image.mutable.*_draw_copy

Change-Id: I3ea6d3264435bbd8390c7a8907e0c7a54c4c6783
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28508Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>

Constructor overloads in Reactor is causing the build on Android to fail.

Change-Id: I446b345d420b8789ece77a245b2cd3eab8499e35
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28444Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>

Change-Id: I7cce7aa50c61c6e2949796105dc980e260745eae
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28402Reviewed-by: Chris Forbes <chrisforbes@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>

Re-enabled the Renderer object's occlusion queries and linked them
to the queries in the query pool. Removed the old Query structure.

Passes all tests in:
Tests: dEQP-VK.query_pool.*

Note: The dEQP-VK.query_pool.*_discard tests currently fail as discard
      appears to disable the occlusion queries. Will fix in next cl.

Bug b/129706526

Change-Id: I937dcf64d2990758d31a1ed6a13af5cf9f0a627b
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28288Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Cube images currently have a 1 pixel border around them for seamless
cubemaps. To add a border around a compressed image would require
adding an entire block's width/height around the image at each mip
level, which would take a lot of extra space and wouldn't be so
useful right now, since we'll perform both image decompression and
cubemap border update before sampling, so might as well do both at
the same time and only store a border in the decompressed image,
so that compressed cube images don't need to keep a border.

Bug b/119620767

Tests: dEQP-VK.pipeline.sampler.view_type.cube.format.*

Change-Id: I17974c0148fded37bca7c17a78d08d5e683a2afb
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28548Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

After this cl, pipeline caches remain unused at pipeline creation
time, but some basic functionalities of the pipeline cache itself
have been added:
- Initial data is copied at pipeline cache creation time
- PipelineCache objects must store a header at the beginning of the
  cache
- Providing a bad size to vkGetPipelineCacheData will now return
  VK_INCOMPLETE

Also fixed a few tracing strings in libVulkan.cpp.

Bug b/123588002

Change-Id: Icc0aadbe6a60bf3d2b9d3a43132d26671f60c728
Tests: dEQP-VK.pipeline.cache.*
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28430
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

queueFamilyIndices are only valid in VK_SHARING_MODE_CONCURRENT mode,
so Buffers were copying garbage in VK_SHARING_MODE_EXCLUSIVE mode.
This cl allows dEQP-VK.robustness.* tests to run and fail rather than
immediately crash at Buffer construction time.

Bug b/118383648
Tests: dEQP-VK.robustness.*

Change-Id: I5b82348317e12302359e082088ed5d10f6367e0e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28311
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Contains a base address, per-lane offsets and a boolean to say whether it is uniform across lanes.

Use this instead of the std::pair for GetPointerToData and WalkExplicitLayoutAccessChain.

Provides readability improvements.

Bug: b/126126820
Change-Id: If3a010d7dc37c4f07ca489ae58195cdfed7ea559
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28568Tested-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.integer.bitfieldinsert.*
Change-Id: I47baf70460ca9a2c829b4c83d517a813f315f539
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28529Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.integer.bitfieldextract.*
Change-Id: Iebc03e7da46fa2dd2ae8d8d3565ffc9597fec985
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28528Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.integer.bitfieldreverse.*
Change-Id: I8c6b73be89c24de371806f6c5d6afbf52f7161c9
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28472Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.builtin.function.integer.bitcount.*
Change-Id: I2fa97f54a1ee68767fd13cafa3aeecfd7d068602
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28471Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.matrix.transpose.*
Change-Id: I5b793ecda3d30de456b9ec7f65c386975a86b97f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28470Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Bug: b/126873455
Tests: dEQP-VK.glsl.matrix.outerproduct.*
Change-Id: I0189bbec3049d01f02191a6c8a7aee2c5d675af3
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28469Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

It's quite common to want the object and the type. Fix up these cases.

Avoids a second Object lookup.

Change-Id: Ied1ae0c8d264cfe6c6ff3603d0d096bf9f657b84
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28468
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Change-Id: Ibc630c1b37ecaad87f9c015d8fecc38a6d6b6392
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28396
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Allow vkGetImageMemoryRequirements2 to set data in the
VkMemoryDedicatedRequirements pNext structure, the same
way vkGetBufferMemoryRequirements2 already does.

Bug b/119620767

Change-Id: I4fb6bc29862eb01188ec1d2a05b4f6cc34629d8a
Tests: dEQP-VK.memory.mapping.dedicated_alloc.image.*
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28488Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Now that we have vk-unittests, it makes sense to prefix unittests by their API name.

Fixes a couple of TODOs

Change-Id: I57234d6b19c3dd4f130b211a0be4e604613b8cd8
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28399
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

Change-Id: I1509e2056f5b06bb956e3968e9d179531cf6eece
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28401Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

... along with a message saying what switch case wasn't handled.

Helps identify what needs fixing for the daily Regres reports.

Change-Id: I79448135fc84190d6e803e90e7995ae83058f663
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28400Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Change-Id: Ic0a5efe8c00564198f929f4a6324598b684352e2
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28398Reviewed-by: Chris Forbes <chrisforbes@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>

The Android loader looks for the symbol `HMI` which describes the module
and provides pointers to the initial entrypoints. Add a minimal
implementation of that.

Based on docs: https://source.android.com/devices/graphics/implement-vulkan#driver_emun
Bug: b/122837488
Change-Id: I367bac2046368bc8a08334cfac2f339ca2c1eb5f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28410Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

- Add initial device-side build configuration for LLVM7
- Made platform headers module available everywhere (host, device+core, device+vendor)
- Added missing source files from src/Vulkan/*
- Adjusted SPIRV-Tools build to be available to vendor code, and static only
  (otherwise we end up with a .so for it in the vendor image)

Bug: b/122837488
Change-Id: I9be0eaf91c90a6967fe9d3f8350c94c530f61122
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28409Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Bug: b/122837488
Change-Id: I45fce8c0b6ef9f6a42f1d3745d7a0434dd08832e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28231Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

On Android we will expose ANDROID_native_buffer instead, and leave the
surface and swapchain support to the android loader.

Bug: b/122837488
Change-Id: I03f0fd617042f49c19227701bbdcd2ccda883c94
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28408Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Added support for these structures in vkCreateImageView:
VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR
VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO

These only add validation without modifying imageView behavior.

This should affect a few thousand tests, which now hit the next
UNIMPLEMENTED() call, inside the SPIR-V compiler.

Bug b/119620767

Change-Id: Icd2f9608d6b9ca1500ada8e51621c8d54ff9cd8d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28429Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

VK_EXT_sample_locations is not supported in SwiftShader, but all
related tests were being marked as unimplemented because
vkGetPhysicalDeviceProperties2 didn't handle
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT.
Explicitly ignored this case (with a proper verification that
VK_EXT_sample_locations is indeed marked as unsupported).

Bug b/117974925

Change-Id: I64a8540c0c30599c8a0a56ce322c563918ba2c31
Tests: dEQP-VK.pipeline.multisample.sample_locations_ext.*
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28428Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Added support for:
VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO
VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO
in vkCreateRenderPass.

These only add extra validations, but don't modify the renderpass' behavior.

Bug b/119620965

Change-Id: I0102a4f7fdd9f57de4ef7b0a813ead951dafe0bb
Tests: dEQP-VK.renderpass.*_use_input_aspect
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28448Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Introduce a new Object::Kind - DescriptorSet.
This represents a pointer to a vk::DescriptorSet*, which is now
dereferenced to access the buffer data in OpAccessChain or OpLoad / OpStore.
This shuffling is required to handle descriptor array access
as the array index is only known at OpAccessChain time.

Tests: *dynamic*
Bug: b/126330097
Change-Id: Id754d966d8945f4e4fcf7895ed2210ce4f6ba713
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28391Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Previously Objects of the Variable kind would hold an Object::ID to another pointerBase object, which was combined with a per-lane offset in SpirvRoutine::intermediates.
This is almost exactly the same as PhysicalPointer - except the base address was taken from SpirvRoutine::physicalPointers.

With descriptor indices, we need a dynamic base pointer (only known at emit time) with per lane offsets.

This change transforms the Kind::Variable and Kind::PhysicalPointer kinds into Kind::DivergentPointer and Kind::NonDivergentPointer. This reduces complexity in loads and stores, and better represents the various forms of pointer we care about.

Bug: b/126330097
Change-Id: I514af5962b9cad4109197893066eda6f996be107
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28390Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

The original dEQP.md covered Windows pretty well, but was confusing to
follow on Linux. So I've fleshed out the Linux process to be as complete
as the Windows process.

Change-Id: I8373e56db7d8d74bf5bcdfc7c7d23b740a11c25a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28369Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Sean Risser <srisser@google.com>

The logic did not handle desciptor arrays, or the descriptor overflow case.

Bug: b/123244275
Tests: *with_template*
Change-Id: Idf3f70848136865d1d76dc4f2f41b4c35d9230db
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28388Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Rename Object::Kind::Value to Object::Kind::Intermediate.
Rename SpirvRoutine::Value to SpirvRoutine::Variable.

Change-Id: I1dba30687cbf979d80b0deeca7a96e64a88c94db
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28393
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Change-Id: I45b04d1043a83a3732aab59a9009bdbbb1ee56ba
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28397Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

Just a safety belt that we're not doing stupid things.

Change-Id: I092b0755d151a559f793e1a9f30b17ef52626d10
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28389
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>