Eric Biggers
ff2c282fb4
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I647f13be357f4d5d19d2577210113c26324fb8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:01:01 +00:00
Eric Biggers
54a7bd48dc
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I85a4346eec74128ae6e9b1bb99e3e96e43c50aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:00:53 +00:00
Eric Biggers
0f285346e5
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I915cad24ff570c667508f9de0fef3e69c25df310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:00:46 +00:00
Eric Biggers
ef37c0da49
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I876562e133dec3532333cf684b95b4d282682bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:00:38 +00:00
Eric Biggers
39bf332aab
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: Iba7aa9d2bbacce83e543d86e798615d2b3aa0625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:00:30 +00:00
Eric Biggers
a86355bfef
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: Id0f7bb7babdcc795d81b597625de44e536ff252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:00:24 +00:00
Eric Biggers
5526853e6d
Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Id5460b2d89d889f640893226e1cba232ce1ec0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:36 +00:00
Eric Biggers
4df21cf7ca
[RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I534bf5bd4ab88aee8afb8d1bc8f6ab732e966e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:33 +00:00
Eric Biggers
be952611ed
[RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I9f47d7a36a6d3d6c1ba5b82d17f21c15dd9f7235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:31 +00:00
Eric Biggers
4eadb46170
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I641bedd5939fe451bd7c478c2105a5a6652e7e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:28 +00:00
Eric Biggers
d685b63f1a
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: Icbaf5892b2804757bc831533fbf2adf851f89f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:22 +00:00
Eric Biggers
ee88d1fd14
[RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: I034fc93d091ee1944a5487e58dd61605bc8e19ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 21:39:18 +00:00
Eric Biggers
74c295ea08
Merge changes from topic "unencrypted-dirs-r" into rvc-dev
...
* changes:
[RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure
[RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only
[RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails
[RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage
2022-04-20 21:12:39 +00:00
TreeHugger Robot
bc7a25dff4
Merge changes from topic "unencrypted-dirs-s" into sc-dev
...
* changes:
Log to EventLog on prepareUserStorage failure
Ignore errors preparing user storage for existing users
UserDataPreparer: reboot to recovery for system user only
UserDataPreparer: reboot to recovery if preparing user storage fails
StorageManagerService: don't ignore failures to prepare user storage
2022-04-20 20:22:16 +00:00
Remi NGUYEN VAN
2f74509789
Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780
Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 15:56:13 +00:00
Remi NGUYEN VAN
49f031ea4d
Disallow PAP authentication when MPPE is requested am: 4f319df8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780
Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 15:39:14 +00:00
Remi NGUYEN VAN
4f319df8ff
Disallow PAP authentication when MPPE is requested
...
MPPE cannot work if PAP is used as authentication, so it is not useful
to allow PAP authentication when MPPE is enforced: establishing the
tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not
performed".
Also users enforcing MPPE may assume that this means PAP will not be
used for authentication, so without this change MPPE enforcement gives a
false sense of security, as PAP uses plain-text credentials.
Bug: 201660636
Test: atest VpnTest
Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417
Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417
(cherry picked from commit 997a4a3926 )
2022-04-07 01:18:19 +00:00
Tyler Gunn
e518ef6409
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:01:12 +00:00
Tyler Gunn
6b36ce6895
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:38:45 +00:00
Tyler Gunn
74f9b7f432
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:15:07 +00:00
Tyler Gunn
8193edd104
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 23:18:55 +00:00
Tyler Gunn
08f8988bc3
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev
2022-04-06 22:58:29 +00:00
TreeHugger Robot
607cc6acf4
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: Ibb2467d2beb1a7a46c6354382fc6108bb5457c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 22:48:08 +00:00
Jonathan Scott
4d47369e41
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I8a2b23cc9d7258d47e468f780928a32a4503bde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 22:47:37 +00:00
TreeHugger Robot
7268d3d045
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I0472617b5f7ee1dec086aee641339497b8630659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 21:17:36 +00:00
Jonathan Scott
693fe862b9
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I4c0aef4b20d7b473d5fa160b64f5e05131b2cd17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 21:17:19 +00:00
TreeHugger Robot
7744c71e64
[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: I8217e2a43bae1be58ec76821f16b05f7fbf0bf43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 21:00:09 +00:00
Jonathan Scott
b7248d037f
[automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: I79744a8cbee16ade46d2f7eb0849b3c6fd41de6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:59:49 +00:00
TreeHugger Robot
63783b32bc
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I0501b2bfddaf5e666c6962b898d8698abbfa01de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:59:42 +00:00
Jonathan Scott
1aa3133d1b
[automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: Ie1052d196899df0aa598d0fe95b318a6cf737493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:59:26 +00:00
TreeHugger Robot
6b4842a815
Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: Ia5272c6945c563040b72921b0e035c81745a0a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:35:01 +00:00
Jonathan Scott
9a83111755
[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I61409fd5cbe7409884dfe0e439d116b098cf9737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:34:58 +00:00
TreeHugger Robot
23c3740386
Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: Ie2d19b07521533699ab4bf814f390e3e03384ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:34:57 +00:00
Jonathan Scott
62de92b4ea
[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530
Change-Id: If074f02ab9e82a4b3d97725f70f3799037e581a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 20:34:54 +00:00
TreeHugger Robot
f0b395138c
Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev
2022-04-06 20:18:08 +00:00
TreeHugger Robot
6485eee24f
Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev
2022-04-06 20:18:03 +00:00
TreeHugger Robot
9bc1facf00
Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev
2022-04-06 20:17:35 +00:00
Jonathan Scott
c5037ec63c
[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning.
...
Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Bug: 210469972
Change-Id: I2de99f9ccd8b27ffdc2562fa451f132e73d54317
2022-04-06 09:23:04 +00:00
TreeHugger Robot
829b1e826e
Merge "Fix NPE" into sc-dev
2022-04-06 05:22:31 +00:00
JW Wang
f6c384ae85
[automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours
...
am skip reason: skipped by user schfan
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189
Change-Id: Id86dae9131e2743a12adc54c46a1e23046c9de63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 02:12:14 +00:00
JW Wang
d10fda2b4d
[automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours
...
am skip reason: skipped by user schfan
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189
Change-Id: Ibfe819cfb2547213a228b291f3e91ed261a73b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 01:50:38 +00:00
JW Wang
6a35ac1222
[automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours
...
am skip reason: skipped by user schfan
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189
Change-Id: Ie699bdec11ef61d86a5069d3555795afa80d2461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 01:19:19 +00:00
JW Wang
364c623d36
[automerger skipped] Fix NPE am: f562aadd77 -s ours
...
am skip reason: skipped by user schfan
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189
Change-Id: I99d33204fb7de123971cdbe91b39e1b9c651e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 01:04:40 +00:00
JW Wang
9a793e0b65
[automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours
...
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591190
Change-Id: I4aec93d1e4814610e7bcc7a340ec25f9c1c392a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:09:39 +00:00
JW Wang
2f86e541d9
Fix NPE am: a3e2e68fd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591433
Change-Id: Ia465094b84a788e0a3b824a4cdf787899149bb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 00:09:13 +00:00
JW Wang
651840fc64
[automerger skipped] Fix NPE am: e58049a3ea -s ours
...
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591190
Change-Id: Idb1bc3b6ee3efb2a624af432d5ba82104b170424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 23:12:37 +00:00
Rob Carr
ca99d26057
Merge "DO NOT MERGE: WM: Call Transaction#sanitize" into sc-dev
2022-04-05 22:14:18 +00:00
JW Wang
73d533592a
Fix NPE
...
NPE happens when there is an orphaned session which we've
tried to prevent in all cases.
Log an error message if this situation happens.
Bug: 227342978
Test: atest CtsRootPackageInstallerHostTestCases
Change-Id: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
(cherry picked from commit 07e31dfb1e )
Merged-In: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
2022-04-05 19:54:09 +00:00
JW Wang
a3e2e68fd0
Fix NPE
...
NPE happens when there is an orphaned session which we've
tried to prevent in all cases.
Log an error message if this situation happens.
Bug: 227342978
Test: atest CtsRootPackageInstallerHostTestCases
Change-Id: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
(cherry picked from commit 07e31dfb1e )
Merged-In: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
2022-04-05 19:51:30 +00:00
JW Wang
e58049a3ea
Fix NPE
...
NPE happens when there is an orphaned session which we've
tried to prevent in all cases.
Log an error message if this situation happens.
Bug: 227342978
Test: atest CtsRootPackageInstallerHostTestCases
Change-Id: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
(cherry picked from commit 07e31dfb1e )
Merged-In: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
2022-04-05 19:51:18 +00:00