Jarkko Pöyry [Wed, 6 May 2015 19:06:00 +0000 (12:06 -0700)]
Fix some warnings in border clamp tests.
Change-Id: I66d0bb08f9fc7d6a3b0a49e8866523d0d36bc61c
Jarkko Pöyry [Tue, 5 May 2015 21:17:34 +0000 (14:17 -0700)]
Fix negative block syntax tests expecting compile success.
Bug:
20852057
Change-Id: Ic92a6b1991a2580713c6f0d0e5c0ecd72bd59e14
Mika Isojärvi [Tue, 5 May 2015 20:11:59 +0000 (20:11 +0000)]
Merge "Add missing finish() calls to multithread and multi context tests." into mnc-dev
Mika Isojärvi [Tue, 5 May 2015 19:36:38 +0000 (19:36 +0000)]
Merge "Require conformant configs in EGL tests." into mnc-dev
Jarkko Pöyry [Tue, 5 May 2015 17:53:21 +0000 (10:53 -0700)]
Fix primitive bbox line verification regression.
Bug:
20852057
Bug:
20453464
Change-Id: Ie59636ad50cc26bd52d45554113e869dc2c6ade7
Jarkko Pöyry [Tue, 5 May 2015 01:48:45 +0000 (01:48 +0000)]
Merge "Check OES_texture_npot in ES2 texture completeness tests." into mnc-dev
Jarkko Pöyry [Mon, 4 May 2015 20:06:16 +0000 (13:06 -0700)]
Check OES_texture_npot in ES2 texture completeness tests.
- Check GL_OES_texture_npot extension in addition to NV extension.
- Remove unused cstdlib include.
Bug:
20808878
Change-Id: I9d6e586cbc0151a7b6900eb30d786c7035b75bd8
Mika Isojärvi [Tue, 5 May 2015 00:29:39 +0000 (17:29 -0700)]
Add missing finish() calls to multithread and multi context tests.
Bug:
20751454
Change-Id: Ic6de190c4784bee483ca2a0e74c5b4c0899f2886
Mika Isojärvi [Mon, 4 May 2015 23:41:57 +0000 (16:41 -0700)]
Require conformant configs in EGL tests.
Bug:
20825158
Change-Id: I8173ea1f2217f642041e66bfe7c509a1f2859e15
Pyry Haulos [Mon, 4 May 2015 22:02:54 +0000 (15:02 -0700)]
Remove problematic shaders.texture_functions tests from mustpass
Bug:
20699985
Bug:
20700212
Change-Id: I0806a4fcbd92a643f2b92a447f8d2a6d30898364
Pyry Haulos [Mon, 4 May 2015 19:56:16 +0000 (19:56 +0000)]
Merge "Remove mediump cos() tests from mustpass" into mnc-dev
Pyry Haulos [Mon, 4 May 2015 19:44:49 +0000 (12:44 -0700)]
Remove mediump cos() tests from mustpass
Bug:
20453754
Change-Id: I71e036cd249d8d835357bbae134ebc6b263c9962
Pyry Haulos [Mon, 4 May 2015 19:30:25 +0000 (12:30 -0700)]
Relax texture filtering precision requirements in ES2 tests
Bug:
20818451
Change-Id: Ia81d90020ad0403ce3a60ec7799a415f1d458cc6
Mika Isojärvi [Fri, 1 May 2015 23:07:06 +0000 (23:07 +0000)]
Merge "Fix memory leak in semaphore self tests." into mnc-dev
Jarkko Pöyry [Fri, 1 May 2015 22:30:09 +0000 (15:30 -0700)]
Fix unused variable warning in release builds.
Change-Id: I00c6ee09f2821a7713bbc2cb8b71b0e589163e97
Mika Isojärvi [Mon, 27 Apr 2015 23:26:41 +0000 (16:26 -0700)]
Fix memory leak in semaphore self tests.
Change-Id: I82a5c8af6f81692704bd7f6a6b1248685883d92a
Mika Isojärvi [Fri, 1 May 2015 20:46:41 +0000 (20:46 +0000)]
Merge "Move GLSL 3.00 ES repeated uniform blocks to invalid group." into mnc-dev
Mika Isojärvi [Fri, 1 May 2015 20:14:22 +0000 (13:14 -0700)]
Move GLSL 3.00 ES repeated uniform blocks to invalid group.
Bug:
20421050
Change-Id: I1587d17ddf7801f13da6d997c4917b0b254892db
Jarkko Pöyry [Fri, 1 May 2015 18:15:21 +0000 (11:15 -0700)]
Assume border color is always in linear space.
Bug:
20755158
Change-Id: I18e048e1537ef5b02020d139eb58a498ab917722
Jarkko Pöyry [Fri, 1 May 2015 00:40:50 +0000 (00:40 +0000)]
Merge "Add EXT_texture_border_clamp tests." into mnc-dev
Jarkko Pöyry [Fri, 10 Apr 2015 01:49:48 +0000 (18:49 -0700)]
Add EXT_texture_border_clamp tests.
Change-Id: I37b2d473e2b1ccdd40a55daa3e6c12e2a28a6e0d
Jarkko Pöyry [Thu, 30 Apr 2015 18:35:43 +0000 (18:35 +0000)]
Merge "Do not assume support for multisampled wide lines." into mnc-dev
Pyry Haulos [Thu, 30 Apr 2015 08:49:24 +0000 (08:49 +0000)]
Merge "Add bug numbers to ES3.1 HW issues list" into mnc-dev
Pyry Haulos [Thu, 30 Apr 2015 08:47:57 +0000 (08:47 +0000)]
Merge "Update GLES3 HW issues list" into mnc-dev
Jarkko Pöyry [Mon, 27 Apr 2015 23:20:50 +0000 (16:20 -0700)]
Do not assume support for multisampled wide lines.
- Allow rasterization, interpolation, and clipping multisampled wide
line cases to fail and report Compatibility Warning instad of
failure.
- Allow line width verification failures in primitive bounding box
tests (and generate compatibility warning).
- Not modiyfing helper_invocation cases since the test tolerate
uncertain line rendering widths.
Bug:
20453464
Change-Id: Ib1ef997c5476e04a02a103f0636201ed94c9354e
Pyry Haulos [Wed, 29 Apr 2015 15:03:56 +0000 (08:03 -0700)]
Add bug numbers to ES3.1 HW issues list
Change-Id: I04928235773f76b1828f2d1c062ac51400d0d7c8
Pyry Haulos [Wed, 29 Apr 2015 12:15:44 +0000 (05:15 -0700)]
Update GLES3 HW issues list
Change-Id: I0279a4b28fdd4511181797194a56f35fbda492e5
Jarkko Pöyry [Tue, 28 Apr 2015 21:03:29 +0000 (14:03 -0700)]
Fix unused variable warning in Release builds.
Change-Id: I7aabc6fdad54f22e072c716a7098678d845e98fe
Jarkko Pöyry [Mon, 27 Apr 2015 22:14:35 +0000 (15:14 -0700)]
Update default VAO attrib divisor tests.
- Expect vertexAttribDivisor on ES31 with default VAO to not generate
a error, i.e. expect vertexAttribDivisor in ES31 to be compatible with
ES30.
Bug:
20154392
Change-Id: I2c009518f5f0686b269f3d2a33ea8a19c3d02470
Jarkko Pöyry [Fri, 24 Apr 2015 23:12:49 +0000 (23:12 +0000)]
Merge "Improve texture border color handling."
Jarkko Pöyry [Fri, 24 Apr 2015 23:12:37 +0000 (23:12 +0000)]
Merge "Avoid handling combined depth-stencil textures as color data."
Jarkko Pöyry [Tue, 31 Mar 2015 03:28:07 +0000 (20:28 -0700)]
Improve texture border color handling.
- Apply border color only to active channels.
- Clamp border color to format range as specified in GL.
- Support int and uint border colors.
- Convert border color of sRGB formats to linear.
- Support border color in texture compare verifier.
Change-Id: Id191c605e61aa513a1aa65c3009dabda72c81163
Jarkko Pöyry [Thu, 23 Apr 2015 02:31:34 +0000 (19:31 -0700)]
Avoid handling combined depth-stencil textures as color data.
Change-Id: I151b443e25329b7903870a08a558f1a38e58abe7
Mika Isojärvi [Fri, 24 Apr 2015 22:58:22 +0000 (22:58 +0000)]
Merge "Use sched_getaffinity for both linux and android."
Jarkko Pöyry [Fri, 24 Apr 2015 22:47:47 +0000 (22:47 +0000)]
Merge "Move getEffectiveTextureView() to tcuTextureUtil."
Jarkko Pöyry [Fri, 24 Apr 2015 22:47:30 +0000 (22:47 +0000)]
Merge "Add support for depth-stencil-mode to Sampler."
Jarkko Pöyry [Fri, 24 Apr 2015 22:07:52 +0000 (22:07 +0000)]
Merge "Handle stencil textures as one-channel int textures."
Jarkko Pöyry [Fri, 24 Apr 2015 22:07:38 +0000 (22:07 +0000)]
Merge "Simplify sglr depth-stencil related code by using tcu and rr utilities."
Jarkko Pöyry [Fri, 24 Apr 2015 22:04:33 +0000 (22:04 +0000)]
Merge "Add getDefaultGatherOffsets() to texture utils."
Mika Isojärvi [Sat, 11 Apr 2015 01:14:14 +0000 (18:14 -0700)]
Use sched_getaffinity for both linux and android.
Use sched_getaffinity to get number of available cores.
Change-Id: I501c81a01a22a4ef3363370f40d35c3320164a0f
Jarkko Pöyry [Fri, 24 Apr 2015 21:46:27 +0000 (21:46 +0000)]
Merge "Update GLES3 HW issues list."
Pyry Haulos [Fri, 24 Apr 2015 17:58:49 +0000 (10:58 -0700)]
Update ES2 & EGL mustpass lists based on latest feedback
Change-Id: I7e0996bb3cbcf1c4f036219d5e346cc293959316
Jarkko Pöyry [Wed, 1 Apr 2015 19:30:42 +0000 (12:30 -0700)]
Handle stencil textures as one-channel int textures.
- Make sampling from stencil texture return stencil value in R channel.
This makes stencil textures behave as in GL.
- Fix tests assuming component w is always stencil.
Change-Id: Ibc12949435330e0ac52a469b2fe8f3eab57d9e67
Jarkko Pöyry [Fri, 24 Apr 2015 01:18:30 +0000 (18:18 -0700)]
Move getEffectiveTextureView() to tcuTextureUtil.
Change-Id: Ia3a1ff2da118c99b2c83d4ccf77eb325d03a85ca
Jarkko Pöyry [Thu, 23 Apr 2015 03:01:38 +0000 (20:01 -0700)]
Add support for depth-stencil-mode to Sampler.
- Add depth-stencil-texture-mode to sampler.
- Support depth-stencil mode in glsTextureTestUtil.
Change-Id: Iedf9db561fea595309638a491e0024f9ca7d51ab
Jarkko Pöyry [Thu, 23 Apr 2015 23:02:39 +0000 (16:02 -0700)]
Add getDefaultGatherOffsets() to texture utils.
Change-Id: Idffc3f4a6b03c227d16d28125a7c8551ad1ad335
Jarkko Pöyry [Tue, 21 Apr 2015 02:46:36 +0000 (19:46 -0700)]
Simplify sglr depth-stencil related code by using tcu and rr utilities.
Change-Id: Id1996c65e3f58729cf3aa54da8653e249baa704e
Jarkko Pöyry [Tue, 21 Apr 2015 03:48:15 +0000 (20:48 -0700)]
Add N-bit min/max/mask utilities to deInt32.h.
- Add internal tests.
- Enable int32, stl_util and command line self tests.
Change-Id: I8546c6fa8e629da7c0a068eeffc88614f7ad1b4e
Jarkko Pöyry [Thu, 23 Apr 2015 20:13:36 +0000 (20:13 +0000)]
Merge "Fix valgrind warnings."
Pyry Haulos [Thu, 23 Apr 2015 18:34:58 +0000 (11:34 -0700)]
Fix dethread build on OS X
On Darwin systems _SC_NPROCESSORS_CONF and _ONLN depend on
_DARWIN_C_FULL which is very cubersome to enable.
Change-Id: Ic78e861d9a46fd633e896461bf47901b7abf710f
Jarkko Pöyry [Thu, 23 Apr 2015 04:20:30 +0000 (21:20 -0700)]
Fix valgrind warnings.
Change-Id: I457ad875af65a62cd7d836de4b07b4f272982338
Jarkko Pöyry [Wed, 22 Apr 2015 02:01:30 +0000 (02:01 +0000)]
Merge "Implement tcu::clear{Depth|Stencil} using tcu::clear."
Jarkko Pöyry [Tue, 21 Apr 2015 21:08:09 +0000 (14:08 -0700)]
Update GLES3 HW issues list.
Bug:
20453463
Change-Id: Ifba442b32451e2bcc1c89a79e034325e8d3e7eb5
Jarkko Pöyry [Mon, 20 Apr 2015 20:35:51 +0000 (13:35 -0700)]
Add UNSIGNED_INT24 channel format.
- Add UINT24 format to tcuTexture.
- Use UINT24 format instead of a combined format in depth-stencil clear
tests.
Change-Id: Ib1ec54edd0c6ed114130fcfc63436298c4bb70c3
Jarkko Pöyry [Tue, 21 Apr 2015 20:50:15 +0000 (20:50 +0000)]
Merge "Remove getDataSize and setPixels from PixelBufferAccess."
Jarkko Pöyry [Tue, 21 Apr 2015 02:05:26 +0000 (19:05 -0700)]
Implement tcu::clear{Depth|Stencil} using tcu::clear.
- Remove duplicated code in clear*.
- Add fillRow() sanity checks.
Change-Id: I81dc8be98c38691ad95fc0cfc659d6a75a24fde8
Jarkko Pöyry [Mon, 20 Apr 2015 22:13:56 +0000 (15:13 -0700)]
Remove getDataSize and setPixels from PixelBufferAccess.
- Remove functions that were not safe to use with non-tightly packed
pixel buffer accesses.
Change-Id: I32b83b089da40ccd052f9d7250498a9c4aa4036f
Jarkko Pöyry [Tue, 21 Apr 2015 00:32:49 +0000 (17:32 -0700)]
Add utilities to split combined-depth-stencil accesses.
Change-Id: I2fed3761217fd55d0273e01a951867804a15a5b9
Jarkko Pöyry [Tue, 21 Apr 2015 19:54:15 +0000 (19:54 +0000)]
Merge "Avoid accessing border color directly in tcuTexture."
Jarkko Pöyry [Tue, 21 Apr 2015 01:50:49 +0000 (18:50 -0700)]
Avoid accessing pixel depth directly in tcuTexCompareVerifier.
- Avoid accessing depth directly to make structure idential to
tcuTexLookupVerifier and to make refactoring easier.
- Add sanity checks to isGatherOffsetsCompareResultValid().
Change-Id: I3afc3015edc775c1baf13eea94a781bc6f6e4829
Jarkko Pöyry [Tue, 21 Apr 2015 00:44:44 +0000 (00:44 +0000)]
Merge "Support not tightly packed pixel buffer accesses in tcuTextureUtil."
Jarkko Pöyry [Fri, 17 Apr 2015 22:21:36 +0000 (15:21 -0700)]
Avoid accessing border color directly in tcuTexture.
- Use lookupBorder to lookup border color.
- Fix assertion failure on 2d array texture gather with border
clamp wrap mode.
Change-Id: If28dee16b743154c7ee0794d45da9d12bccc4fd1
Jarkko Pöyry [Wed, 1 Apr 2015 22:42:35 +0000 (15:42 -0700)]
Support not tightly packed pixel buffer accesses in tcuTextureUtil.
- Fix assumptions that pixel size == pixel stride.
- Remove copyRawPixels. It was only useful for format reinterpreting
data copies but there was not code using it for that.
Change-Id: I2743c5f197d7cf2bc4ef76e3ebe8b9dd6577c28e
Mika Isojärvi [Mon, 20 Apr 2015 23:55:36 +0000 (23:55 +0000)]
Merge "Allow both errors in getFramebufferAttachmentParameter tests."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Add getTextureFormatChannelMask."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:28 +0000 (23:55 +0000)]
Merge "Skip complex compare verification if reference and result are identical."
Jarkko Pöyry [Mon, 20 Apr 2015 23:55:25 +0000 (23:55 +0000)]
Merge "Improve logging of texture border color."
Mika Isojärvi [Mon, 20 Apr 2015 21:09:54 +0000 (14:09 -0700)]
Allow both errors in getFramebufferAttachmentParameter tests.
Allow both GL_INVALID_ENUM and GL_INVALID_OPERATION in
getFramebufferAttachmentParameteriv negative tests.
Bug:
20340817
Change-Id: I8393d0d7af2e60b1666352da8f33504e21be677b
Mika Isojärvi [Mon, 20 Apr 2015 21:19:12 +0000 (14:19 -0700)]
Allow INVALID_OPERATION in glTexImage3D negative tests.
Allow both INVALID_OPERATION and INVALID_VALUE if internalformat is
not valid.
Bug:
20340818
Change-Id: Ie81f781f65d4d8d9996625d6824b0051a0a8a4b2
Pyry Haulos [Fri, 17 Apr 2015 22:57:51 +0000 (15:57 -0700)]
Update libpng reference to 1.6.17
Change-Id: Idef27a35ca598c1df95f1c38392aa0450322392a
Jarkko Pöyry [Fri, 17 Apr 2015 21:20:54 +0000 (21:20 +0000)]
Merge "Clean up texture sampling and verification code."
Jarkko Pöyry [Fri, 17 Apr 2015 21:20:16 +0000 (21:20 +0000)]
Merge "Support getting transfer format for BGRA textures."
Jarkko Pöyry [Fri, 17 Apr 2015 21:19:17 +0000 (21:19 +0000)]
Merge "Support uploading compressed 3D textures in gluTexture."
Jarkko Pöyry [Fri, 17 Apr 2015 21:17:34 +0000 (21:17 +0000)]
Merge "Avoid UB in getBits if numBits were 32."
Mika Isojärvi [Fri, 17 Apr 2015 20:42:22 +0000 (20:42 +0000)]
Merge "Remove invalid robustness KHR_create_context tests."
Mika Isojärvi [Wed, 15 Apr 2015 22:52:06 +0000 (15:52 -0700)]
Remove invalid robustness KHR_create_context tests.
Remove tests that tried to create robust OpenGL ES context using
EGL_KHR_create_context instead of EGL_EXT_create_context_robustness.
Bug:
20256754
Change-Id: I18956521c3bf7ab6ef8ec0f5a8f66f9752355e81
Jarkko Pöyry [Fri, 17 Apr 2015 20:23:27 +0000 (13:23 -0700)]
Remove tests affected by bug
20340818 from mustpass.
Bug:
20340818
Change-Id: I0ca925547d70f75d6a464a5269518eae941d2bf3
Jarkko Pöyry [Fri, 17 Apr 2015 20:20:36 +0000 (13:20 -0700)]
Remove tests affected by bug
20340817 from mustpass.
Bug:
20340817
Change-Id: I969e12761ebdfd323c01dc93901899db9b9b9340
Pyry Haulos [Fri, 17 Apr 2015 20:13:56 +0000 (20:13 +0000)]
Merge "Fix more valgrind warnings in negative API tests"
Jarkko Pöyry [Thu, 16 Apr 2015 22:49:10 +0000 (15:49 -0700)]
Add default VAO vertexAttrbDivisor GLES3/GLES31 behavior change tests.
- Add positive test for default VAO divisor in GLES3.
- Add negative test for default VAO divisor in GLES31.
- Use VAO in vertex_attrib_binding divisor state query tests.
Bug:
20154392
Change-Id: Iac43c4484bf7c5eff2409c964778e3dc304649f9
Pyry Haulos [Fri, 17 Apr 2015 20:06:50 +0000 (20:06 +0000)]
Merge "Remove complex builtin function constant folding cases from mustpass"
Jarkko Pöyry [Fri, 17 Apr 2015 20:04:47 +0000 (20:04 +0000)]
Merge "Fix EGL render tests on 5551."
Mika Isojärvi [Fri, 17 Apr 2015 18:53:56 +0000 (18:53 +0000)]
Merge "Remove check that required NULL to be invalid native window."
Mika Isojärvi [Fri, 17 Apr 2015 18:53:32 +0000 (18:53 +0000)]
Merge "Remove incompatible EGLImage modify glTexSubImage tests."
Mika Isojärvi [Thu, 16 Apr 2015 22:53:09 +0000 (15:53 -0700)]
Remove incompatible EGLImage modify glTexSubImage tests.
Remove EGLImage tests that tried to modify EGLImage created in GL with
incompatible format using glTexSubImage.
Bug:
20177340
Change-Id: Ib9cf9e882e63dd233a7589fcce3005562f576186
Pyry Haulos [Fri, 17 Apr 2015 17:19:06 +0000 (10:19 -0700)]
Fix more valgrind warnings in negative API tests
Change-Id: Ic3ea9d41b45da5f904b970c74a230c94539f54b6
Jarkko Pöyry [Fri, 17 Apr 2015 17:59:04 +0000 (17:59 +0000)]
Merge "Fix incorrect assumptions of native GraphicBuffer ctor/dtor/lifetime."
Pyry Haulos [Fri, 17 Apr 2015 16:56:27 +0000 (09:56 -0700)]
Remove complex builtin function constant folding cases from mustpass
See Khronos bug 11600
Bug:
20334181
Change-Id: I60cc88bb354f62b2e4c02c711976d79165d5ea73
Mika Isojärvi [Fri, 17 Apr 2015 17:04:03 +0000 (10:04 -0700)]
Remove copy image tests using snorm from mustpass list.
Bug:
20302019
Change-Id: I5f4fed07fca207a3ea4d6ae4b727758265dd4578
Mika Isojärvi [Wed, 15 Apr 2015 23:33:22 +0000 (16:33 -0700)]
Remove check that required NULL to be invalid native window.
Remove check from negative EGL API tests that required that native window NULL
should produce EGL_BAD_NATIVE_WINDOW error.
Bug:
20176899
Change-Id: Ibe5d203121f4bb1f0fc6b0516575998aacadd671
Mika Isojärvi [Fri, 17 Apr 2015 16:49:33 +0000 (16:49 +0000)]
Merge "Add more negative GLSL ES 3 uniform block tests."
Jarkko Pöyry [Wed, 15 Apr 2015 01:25:53 +0000 (18:25 -0700)]
Fix EGL render tests on 5551.
- Disable dithering since one-bit alpha dithering cannot be verified.
- Avoid generating narrow triangles.
Bug:
20176678
Change-Id: Ib3372011bda3a99dae51698215e13b881926929b
Jarkko Pöyry [Mon, 13 Apr 2015 22:08:05 +0000 (15:08 -0700)]
Improve logging of texture border color.
Change-Id: I143e4e650eac20304320631eb0a00aa55b79dc87
Jarkko Pöyry [Sat, 11 Apr 2015 01:50:39 +0000 (18:50 -0700)]
Clean up texture sampling and verification code.
- Remove unused function.
- Fix some source whitespace alignment issues.
Change-Id: If6fe06708af62421194b43bb7efa8a9e63a8684b
Jarkko Pöyry [Sat, 11 Apr 2015 00:00:22 +0000 (17:00 -0700)]
Skip complex compare verification if reference and result are identical.
Change-Id: I75ac3430812fd8fe9fda78bc09f9ef1aece1e61e
Jarkko Pöyry [Fri, 10 Apr 2015 01:31:44 +0000 (18:31 -0700)]
Add getTextureFormatChannelMask.
Change-Id: I282ff43e628c9400a572163baa0e90bde30d460a
Jarkko Pöyry [Tue, 14 Apr 2015 22:31:49 +0000 (15:31 -0700)]
Support getting transfer format for BGRA textures.
Change-Id: I3de348f27d061c91f3c54384b8bccd868137ea0a
Mika Isojärvi [Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)]
Merge "Add GLES3.1 uniform block syntax tests."
Mika Isojärvi [Fri, 17 Apr 2015 00:40:49 +0000 (17:40 -0700)]
Add more negative GLSL ES 3 uniform block tests.
Add new tests that test more invalid identifiers.
Change-Id: I138283623a98c980790e392b64d434dab33f51d4
Jarkko Pöyry [Thu, 16 Apr 2015 20:35:48 +0000 (13:35 -0700)]
Fix incorrect assumptions of native GraphicBuffer ctor/dtor/lifetime.
- Do not expect C1 ctor to return this on x86 and ARM64.
- Use initCheck() to check if ctor failed.
- Use native object refcounting methods to handle object lifetime.
Bug:
20218384
Change-Id: Ia5f22c841291655df4970988bde1fe142c85bff5