LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,808 Commits 2 Branches 0 Tags
7486607f4b19f445ac1da3b3cc6144d981d44a6c
Commit Graph

2808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
dace5ac894 Merge ab/6749736 in stage. 
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
 2020-10-10 20:38:57 -07:00
Bill Yi
4558f8f002 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours am: c5f6e724a4 -s ours am: c281e94f60 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab
 2020-09-19 08:02:00 +00:00
Bill Yi
72c4162bad [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours am: 953d2224f7 -s ours am: 7fe436bd3a -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
 2020-09-19 08:01:04 +00:00
Bill Yi
c281e94f60 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours am: c5f6e724a4 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
 2020-09-19 07:01:25 +00:00
Bill Yi
7fe436bd3a [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours am: 953d2224f7 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
 2020-09-19 07:00:58 +00:00
Bill Yi
c5f6e724a4 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 am: 24c8811399 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
 2020-09-19 05:51:33 +00:00
Bill Yi
953d2224f7 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea am: b450e2e7e3 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
 2020-09-19 05:50:36 +00:00
Bill Yi
24c8811399 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5249616425 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
 2020-09-19 05:25:29 +00:00
Bill Yi
b450e2e7e3 Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
 2020-09-19 05:22:39 +00:00
Bill Yi
5249616425 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:48 +00:00
Bill Yi
4c6dc6bbea Merge mainline-release 6664920 to master - DO NOT MERGE 
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
 2020-09-17 21:56:59 -07:00
Bill Yi
2bcfd77e3b [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 1985b30083 -s ours am: 2d0bf149cf -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
 2020-09-14 22:20:16 +00:00
Bill Yi
2d0bf149cf [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 1985b30083 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
 2020-09-14 21:50:56 +00:00
Bill Yi
1985b30083 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
 2020-09-14 21:18:54 +00:00
Bill Yi
32271f3ab0 Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
 2020-09-13 07:58:42 -07:00
Xin Li
3c30341b97 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 109e72941f -s ours am: 110fa82457 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
 2020-09-11 03:58:59 +00:00
Xin Li
110fa82457 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 109e72941f -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
 2020-09-11 03:33:28 +00:00
Xin Li
109e72941f [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
 2020-09-11 02:02:37 +00:00
Xin Li
4e4e192c97 Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
 2020-09-09 20:21:10 -07:00
Xin Li
b2aa183bbe [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 71088f4be9 -s ours am: a6b343a9bf -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: I6e8a2040ecfef8ba0e28807c2f753d68afa32155
 2020-09-02 20:33:01 +00:00
Xin Li
a6b343a9bf [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 71088f4be9 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
 2020-09-02 19:37:31 +00:00
Xin Li
71088f4be9 [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
 2020-09-02 19:15:20 +00:00
Xin Li
9543e82a2e Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
 2020-09-02 11:44:54 -07:00
Xin Li
a06833b6ea [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 60c68b25d9 -s ours am: bf6fb53f14 -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7
 2020-09-01 22:09:55 +00:00
Xin Li
bf6fb53f14 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 60c68b25d9 -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
 2020-09-01 21:46:39 +00:00
Xin Li
60c68b25d9 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
 2020-09-01 20:37:03 +00:00
Xin Li
8399e3d5eb Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
 2020-08-31 21:21:38 -07:00
Treehugger Robot
53a9a4c3da [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours am: 83f0491092 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ifba95c25fab6decc52b78cc92c95b100d5066fb6
 2020-08-25 21:33:59 +00:00
Treehugger Robot
83f0491092 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
 2020-08-25 21:09:22 +00:00
Treehugger Robot
0f61b833d5 Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
 2020-08-25 20:49:04 +00:00
Treehugger Robot
445d5093c6 Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
 2020-08-25 20:27:30 +00:00
Treehugger Robot
ebae7edd37 Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
a40b5dad28 Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-25 18:03:38 +08:00
Automerger Merge Worker
5c56b125e8 Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09" into rvc-qpr-dev-plus-aosp 2020-08-23 13:42:14 +00:00
TreeHugger Robot
dbaebf773d Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I0c3658f86f2d359778f63d3dfe4e682708ddbb71
 2020-08-23 13:41:55 +00:00
TreeHugger Robot
3475d22543 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: efe8bb2a2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I8e6777e87c50699977316d88478f230fce494c42
 2020-08-23 13:41:47 +00:00
TreeHugger Robot
efe8bb2a2a Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: Ia10dc546e107e9c1fc249766c2bcfc5856ce1bd2
 2020-08-23 13:18:49 +00:00
Treehugger Robot
f9f95947fb [automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours am: 5312ef34e0 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ibb6e437300cba97e85a4d4f6f4574c1018d8c4f8
 2020-08-20 05:00:44 +00:00
junyulai
82b1eb23c2 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours am: ec46592a67 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: Ifd25659b5103031454cb1caa88189798f33b1fbf
 2020-08-20 05:00:30 +00:00
Treehugger Robot
5312ef34e0 [automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a
 2020-08-20 04:43:44 +00:00
junyulai
ec46592a67 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I653f77d2f7d5b0b69602ab362888c43c1a2aceb3
 2020-08-20 04:43:33 +00:00
Treehugger Robot
ca4235f9a6 Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
 2020-08-20 04:06:51 +00:00
junyulai
2ec09ea15b [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I36cacaf70c7a067fc93d01d0f2c89a90cc2694ae
 2020-08-20 04:06:47 +00:00
Treehugger Robot
2c3d87e23c Merge changes I0faeda20,I726e74f5 am: c6a61f9eee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21
 2020-08-20 03:56:13 +00:00
junyulai
ea11e8a174 Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I4bfdd2dcc7bd6b1e15248d7ef855fc40db018c4a
 2020-08-20 03:56:10 +00:00
Treehugger Robot
c6a61f9eee Merge changes I0faeda20,I726e74f5 
* changes:
  Add 5G NSA to collapsed RAT types list
  Add getAllCollapsedRatTypes to NetworkTemplate
 2020-08-20 03:44:07 +00:00
junyulai
dad37d17fb Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-19 09:53:20 +00:00
Chiachang Wang
06f68e1736 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad am: 2a0b75be4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
 2020-08-12 10:43:42 +00:00
Chiachang Wang
2a0b75be4c Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
 2020-08-12 10:28:50 +00:00
junyulai
fd139892de Add 5G NSA to collapsed RAT types list 
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.

Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
      UidAtomTests#testMobileBytesTransferByFgBg \
      UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
(cherry-picked from ag/12355984)
 2020-08-12 10:12:48 +00:00