Edwin Tung
5be8eb16e6
gps: update gps driver 142.20.23.537976
...
Fix power duty-cycle issue
Fix gpsd crash issue
Fix gps start fail while running Astress
Fix measurement elapsedRealTime variation issue
Reduce NLP request
Improve warm start accuracy
Add additional PLMN codes for TMO
Fix no earlyfix while OTDOA disabled
Bug: 232035911
Bug: 232035671
Bug: 213264365
Bug: 230598202
Bug: 228395377
Bug: 221000024
Bug: 230811304
Bug: 230818100
Verify test: 233212600
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestCases
Change-Id: Ia6803fb246937233094dc4a49e62a21ee906e87c
2022-05-22 23:53:34 +00:00
Edwin Tung
afe8547c8f
Revert "gps: enable GNSS PPS feature"
...
This reverts commit 9b97563405
.
Reason for revert: b/230265527 shows PPS malfunction impact gps location report. We need to disable PPS until PPS function fully functionality and robust.
Bug: 230265527
Change-Id: Iedd753fd243ec268268418629c2c7fa94ce57b9f
2022-05-11 08:49:24 +00:00
Edwin Tung
eff3df6d75
gps: update gps driver 142.20.23.534799
...
Migrate GNSS HIDL HAL to AIDL HAL
Add a gps.xml configuration parameter for CHRE/CHPP baud rate
Fix for PVT assertion at patch_pvt_engine_cbs line=0078
Additional field in SatellitePVT
Prevent the wrong common bias delta estimation
Prevent wrong unhealthy satellites selection
Fix LPPe UBP rounding error
Fix LPPe UBP error message
Fix ADR issues
Add debug log for ADR and clk Bias
Support pressureNotAvailable in LPPe
Fix AIDL2 measurement corrections issue
Fix unregistered pressure data after LPPe session
Fix dereferenced null pointer
Handle LTE B13/14 band handover
Fixed the ordering of the GLNS satellites based on the ephemeris availability
Report AGC values by constellation and central frequency
Bug: 226691677
Bug: 218580284
Bug: 213009701
Bug: 226805895
Bug: 223361838
Bug: 226112617
Bug: 223593119
Bug: 225285619
Bug: 224969521
Bug: 225278936
Bug: 225285619
Bug: 228301290
Bug: 228405504
Bug: 229038024
Bug: 228288159
Bug: 229032461
Bug: 228791446
Verify test: 230286350
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: Ia074bc30bf2ff52ea7ba26324c52c06c00b70979
2022-04-28 07:08:47 +00:00
Edwin Tung
45ea48cfc6
Revert "gps: update gps driver 140.20.23.532343"
...
This reverts commit 76af536f84
.
Reason for revert: The patch cause regression issue on b/228932000 and b/228935134, revert first.
Change-Id: Icb4d28c9cbe19a776b356b35372326dfdaadb011
2022-04-13 03:45:28 +00:00
Edwin Tung
76af536f84
gps: update gps driver 140.20.23.532343
...
Migrate GNSS HIDL HAL to AIDL HAL
Add a gps.xml configuration parameter for CHRE/CHPP baud rate
Fix for PVT assertion at patch_pvt_engine_cbs line=0078
Additional field in SatellitePVT
Prevent the wrong common bias delta estimation
Prevent wrong unhealthy satellites selection
Fix LPPe UBP rounding error
Fix LPPe UBP error message
Bug: 226691677
Bug: 218580284
Bug: 213009701
Bug: 226805895
Bug: 223361838
Bug: 226112617
Bug: 223593119
Bug: 225285619
Verify test: 228173359
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I18dbc36fec41d148a4f9bb0f9516a7e631aaa515
2022-04-08 01:31:14 +00:00
Joe Huang
9dd9934e75
gps: Set SuplUseFwCellInfo to false
...
- Set SuplUseFwCellInfo=false to prevent SUPL long TTFF issue
Bug: 223488012
Test: GNSS sanity test
Change-Id: I88491c6bdec598c11ee884ed39ff8d8ec2ce4394
2022-03-23 17:13:41 +08:00
Edwin Tung
932961f75f
gps: update gps driver 129.20.23.529478
...
Fix NI control plane issue
Add NFW IPC between AP and CP
Ignore RTI in cold start
Fix OnChip logging issue
Bug: 221337679
Bug: 216098015
Bug: 219856838
Bug: 213009701
Verify test: 224635609
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I3ad13f2d227a30de06c9873c3c4ea012a4d0af54
2022-03-17 01:51:27 +00:00
Edwin Tung
9b97563405
gps: enable GNSS PPS feature
...
Bug: 223072369
Test: Gnss measurement elapsedrealtime work && suspend/resume work
Change-Id: I885e33876bb73e9dc3ceb44355b3f2e4bf403187
2022-03-10 07:11:06 +00:00
Edwin Tung
99461f3c67
gps: Set RTO/SUPL download interval to 20 min
...
Bug: 220457118
Verify test: 222416929
Test: TTFF and RTO download
Change-Id: Ib8560400676b2edc59e31c0211c5d6c7b7f2d8f8
2022-03-08 03:48:40 +00:00
Edwin Tung
be81c50641
gps: update gps driver 129.20.23.528102
...
Rescale DBH accuracy and add timestamp
Pick newest FLP location for LPPe DBH
Not to request DBH location for the non-emergency NI
Keep reqporting PPS in duty-cycle
Release SUPL wakelock while framework restart
Fix NI AGPS accuracy and hot start accuracy issue
Fix cts testRequestFlush issue
Fix gps crash issue
Fix re-calibration on the fly issue
Fix OnChip mode TTFF issue
Fix OnChip mode GnssStatus no el/az issue
Bug: 214399728
Bug: 211171235
Bug: 218586958
Bug: 215660420
Bug: 207804509
Bug: 208178903
Bug: 214551540
Bug: 213792299
Bug: 205770623
Bug: 205776935
Bug: 213009701
Bug: 218457536
Bug: 215660420
Bug: 215660420
Bug: 213388910
Bug: 218608516
Verify test: 220461118
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I6be87ae025495dd914d391905e288a2084a1393e
2022-03-01 02:16:47 +00:00
Edwin Tung
0793c1b50b
gps: Add potential fix for MCU crashing
...
Allocate the memory with aligned fragment by fixed multiple 512 bytes
Bug: 213009701
Test: atest PtsChreTestRunner
Change-Id: Ifb9849013702a1659862e21b074030137f125f28
2022-01-19 18:34:06 +08:00
Edwin Tung
3d54c6f3a5
gps: update gps driver 129.20.23.524633
...
Fixed null pointer dereferencing while injectNLPError
Added SuplUseFwCellInfo (default:true) xml attribute
Fixed to block MDT location request when it is not granted by carrier location application
Bug: 210070896
Bug: 211381328
Bug: 210935899
Verify test: 214386315
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: If597efa6bfc9d0a606a12bf09babb32e1ee3d3b4
2022-01-19 06:02:07 +00:00
Edwin Tung
e7c3814380
gps: update gps driver 129.20.23.523968
...
Request DBH while capability transaction.
Report location info without waiting for DBH.
Use gps location as DBH while timeout.
KDDI NI requires noPreference for suplPrefMethod.
Bug: 206754082
Bug: 207721798
Verify test: 212326933
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I235ea87c683051879ce160d0d41917328ca58e37
2021-12-29 15:42:34 +08:00
Edwin Tung
2a710d42e8
Revert "gps: enable GNSS PPS feature" am: 5759adffeb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16492256
Change-Id: Id90de3ed58654c3e67c5646388add485d08850c4
2021-12-18 08:01:33 +00:00
Edwin Tung
5759adffeb
Revert "gps: enable GNSS PPS feature"
...
Bug: 211170885
This reverts commit 09409af2d8
.
Reason for revert: The wrong elapsed realtime cause 1/2 Hz location update.
Change-Id: Ice1fe26627b6aed8d622d748a1f044b6acfe177f
2021-12-18 07:38:13 +00:00
Edwin Tung
41710c8070
gps: update gps driver 129.20.23.522768
...
Fix power mode abnormally turned off by setPositionMode
Fix GPS crashing issue
Fix location lagging during driving
Auto switch constellation for on-chip mode
Bug: 207436894
Bug: 206074009
Bug: 204136420
Bug: 201591644
Verify test: 209775831
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: Ib13683ef768197a5b24ecea43c58a94cc42214a8
2021-12-10 08:36:08 +00:00
Edwin Tung
5825db434b
gps: enable GNSS PPS feature am: 09409af2d8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16421979
Change-Id: I803ded1ae3e6c7b1c346dfb16055ddcbe3711d30
2021-12-10 06:26:37 +00:00
Edwin Tung
09409af2d8
gps: enable GNSS PPS feature
...
Bug: 175086879
Test: Gnss measurement elapsedrealtime work
Change-Id: I959587225dd86a3efa11ecfbdd2b57374f09eef8
2021-12-10 05:51:51 +00:00
Edwin Tung
187392eab8
[DO NOT MERGE] gps: update gps driver 129.20.23.522768
...
Fix power mode abnormally turned off by setPositionMode
Fix GPS crashing issue
Fix location lagging during driving
Auto switch constellation for on-chip mode
Bug: 207436894
Bug: 206074009
Bug: 204136420
Bug: 201591644
Verify test: 209775831
Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I8562af321a6238009127345a591d8bb1f6197fc2
2021-12-10 05:51:39 +00:00
Shinru Han
46122a6976
gps: Update EnableOnChipStopNotification am: d8ce158324
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16402291
Change-Id: I7d4e8b6293737483ba153b8d0e7b9a5f6e151756
2021-12-08 09:42:54 +00:00
Shinru Han
d8ce158324
gps: Update EnableOnChipStopNotification
...
Set EnableOnChipStopNotification=”2”.
Sends on-chip stop notification only when the Host request exists and on-chip request stops.
Bug: 208940846
Test: logging test for case #1 , #3 and #4 in b/197196725#comment39
Change-Id: I8a244eb3a705f1cc2884e1a180cb8ad6ebd41ad7
2021-12-08 09:20:44 +00:00
Shinru Han
dbd9909393
gps: Correct ESW crash dump path am: b35bb78536
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16361903
Change-Id: I7666fad8a5b5e2451492d0855abaf481e6695273
2021-11-30 16:07:52 +00:00
Shinru Han
b35bb78536
gps: Correct ESW crash dump path
...
Bug: 207587485
Test: ESW crash dump can be found under data/vendor/gps/logs after
running command :
echo Lhe:write=0xFFFFFFFF,4 > /data/vendor/gps/LheConsole.toAsic
Change-Id: Icf3505a8d29e867f81eb513d25bf790085a2819f
2021-11-30 07:26:21 +00:00
Edwin Tung
0ce77d984d
gps: update gps driver 129.20.23.521367
...
Improve stopping conditions for urban driving
Fix GTS issues
Improve Spirent AGPS drive accuracy
Add PRs and PRRs log
Fix SUPL over WIFI issue
Integrate SatPvt URE fix
Fix SB Lab issue
Bug: 207606667
Bug: 200942298
Bug: 204963837
Bug: 202366378
Bug: 202250827
Bug: 203615018
Bug: 205653853
Bug: 198384193
Sanity Test: 207330491
Test: atest CtsLocationGnssTestCases
atest VtsHalGnssV1_0TargetTest
atest VtsHalGnssV1_1TargetTest
atest VtsHalGnssV2_0TargetTest
atest VtsHalGnssV2_1TargetTest
atest VtsHalGnssTargetTest
atest GtsLocationTestCases
atest PtsChreTestRunner
Change-Id: I73d0accb288149c458e232ae3f1b985112de7cd6
2021-11-25 03:25:35 +00:00
Edwin Tung
e5036ffd10
[DO NOT MERGE] gps: update gps driver 129.20.23.521367
...
Improve stopping conditions for urban driving
Fix GTS issues
Improve Spirent AGPS drive accuracy
Add PRs and PRRs log
Fix SUPL over WIFI issue
Integrate SatPvt URE fix
Fix SB Lab issue
Bug: 200942298
Bug: 204963837
Bug: 202366378
Bug: 202250827
Bug: 203615018
Bug: 205653853
Bug: 198384193
Sanity Test: 207330491
Test: build pass
Change-Id: If5720611a734d7d76780b22781e8650b779f27f4
2021-11-23 00:37:27 +00:00
Joe Huang
764b89e605
Modify gnss device.mk to support new projects am: 987378054f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16128399
Change-Id: I7a4311a5979467d03c047ec0e9a44abf618a3b07
2021-11-15 02:55:18 +00:00
Joe Huang
987378054f
Modify gnss device.mk to support new projects
...
Copy default gps.xml to only specific projects under gs101 and maintain
new projects in their own folders.
Bug: 203745796
Test: Build test and check config
Change-Id: Ic0b6f8a6e41063f5c42573aea91650007963912b
2021-11-15 02:37:35 +00:00
Edwin Tung
4042442465
[DO NOT MERGE] gps: update gps driver 129.20.23.518574 am: 6728033aa3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16101543
Change-Id: If077d43a1f883db2e6486f179abee19fad1adf9b
Test: build pass
2021-10-27 23:00:50 +08:00
Edwin Tung
28f628e17c
[DO NOT MERGE] gps: update gps driver 129.20.23.518574
...
Report agnss position even no NLP location
Fix to delete RTO too when delete all aiding received
Add mutex to protect malloc/free
Fix for the bug of power mode logging in ONCHIP_NMEA
Reporting PLMN (MCC+MNC) of SIM and Network
Fix GPS outage when OnChip/Host switching
Fix LPPe UBP issue
Fix gpsd crash issue
Bug: 202366527
Bug: 199818363
Bug: 199048681
Bug: 201582435
Bug: 199114573
Bug: 197716902
Bug: 195383842
Bug: 200107911
Bug: 203068978
Sanity Test: 203854792
Test: build pass
Change-Id: I27f314a4b2b5a82e27186a170f10b1041b7d0650
2021-10-27 14:09:08 +00:00
Jiyong Park
97dbda85c0
Remove ndk_platform backend. Use the ndk backend. am: 493c5f6adb am: c33a459eb2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16126494
Merged-In: I25ec19101c408cc29df38d127f284c7085fe1d1a
Change-Id: Ibca1e00f1e410e88c231329cabe7ede131a20b7c
2021-10-27 12:29:09 +09:00
Jiyong Park
2cba9caeb1
Remove ndk_platform backend. Use the ndk backend. am: 3428793114 am: 7760ffc444
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16119649
Change-Id: Id83ed275af2699344d9eee747cbcd8c7e9333789
2021-10-27 03:17:32 +00:00
Jiyong Park
2ec7b3ed96
Remove ndk_platform backend. Use the ndk backend. am: 493c5f6adb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16119650
Merged-In: I25ec19101c408cc29df38d127f284c7085fe1d1a
Change-Id: I27e0477d8673dd78fd96a2ceddc597f8435372c5
2021-10-27 10:28:53 +09:00
Jiyong Park
a259a1db18
Remove ndk_platform backend. Use the ndk backend. am: 3428793114
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16119649
Change-Id: I2657a0f2342879a8897af8677b3ec665e3a723e4
2021-10-27 01:05:57 +00:00
Jiyong Park
33a1aaa056
Remove ndk_platform backend. Use the ndk backend.
...
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.
The prebuilt files had a reference to
android.hardware.gnss-V1-ndk_platform.so. Change it to
android.hardware.gnss-V1-ndk.so by diretly editing the DT_NEEDED entry.
Bug: 161456198
Test: m
Merged-In: I25ec19101c408cc29df38d127f284c7085fe1d1a
Change-Id: I25ec19101c408cc29df38d127f284c7085fe1d1a
2021-10-26 15:39:21 +09:00
Jiyong Park
96a77be5a3
Remove ndk_platform backend. Use the ndk backend.
...
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.
Bug: 161456198
Test: m
Merged-In: Iebc1c5d4c277e96cf7564d882aeecb084adc53ee
Change-Id: Iebc1c5d4c277e96cf7564d882aeecb084adc53ee
(cherry picked from commit 25368375b1759a13cacbfa1a9a183d4eee7381b2)
2021-10-26 15:36:47 +09:00
Edwin Tung
7d0d2634ef
[DO NOT MERGE] gps: update gps driver 129.20.23.516938
...
Rescale accuracy confident to 67% for AGPS NI request
Fix velocity URE in SatellitePvt
Fix scd crash
Enhance log mechanism
Fix avc denied
Force 1 sec interval in emergency mode
Bug: 199581865
Bug: 200654813
Bug: 201514516
Bug: 197196725
Bug: 201382800
Bug: 201729040
Sanity Test: 202280989
Test: build pass
Change-Id: I425e3f05e9ffc51ffeaa3f4d3d17a92592097a23
2021-10-08 14:55:53 +00:00
Edwin Tung
3221acba2a
[DO NOT MERGE] gps: update gps driver 129.20.23.516384
...
Rescale accuracy confident to 67% for AGPS NI request
Set LPPe DBH altitude value to maxima if no FLP altitude
Bug: 199581865
Bug: 199719571
Bug: 201238299
Sanity Test: 201497808
Test: build pass
Change-Id: I151340dbed8b4ee4aa972c09d284e39f9702223c
2021-10-01 04:14:07 +00:00
Shinru Han
f50b8ee88a
gps: Update SecondaryConfigPath am: 80b57c3d63 am: 296288785f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15919522
Change-Id: Ied53bf97a0b220fc76005033cf5a13936698444b
2021-09-28 01:55:17 +00:00
Shinru Han
d26a4b6795
gps: Update SecondaryConfigPath am: 80b57c3d63
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15919522
Change-Id: I40a233e0d72e84ddae20bffc80f5b6c7be4926b8
2021-09-28 01:42:57 +00:00
Edwin Tung
668587bc3d
[DO NOT MERGE] gps: update gps driver 129.20.23.515167
...
Fix LPP GNSS ID misplaced with QZSS
Disable hardware Geofence
Improve log for onChipStopNotification
Improve PMM mode
Restore carrier config after gps crashing
Fix incorrect altitude encoding of LPPe DBH
Set LPPe CP enable by default
Set LPPe DBH altitude value to maxima if no FLP altitude
Bug: 193380649
Bug: 196702082
Bug: 197196725
Bug: 197563181
Bug: 198261454
Bug: 199677624
Bug: 198727829
Bug: 199719571
Sanity Test: 200797783
Test: build pass
Change-Id: I65813ae49d631f9fe73f2f35ed088978d0ee8f95
2021-09-28 01:37:39 +00:00
Shinru Han
41e8d749db
gps: Update SecondaryConfigPath
...
The seconday config under data/vendor/gps/logs/ could be removed by tester.
Update the SecondaryConfigPath to data/vendor/gps/overlay/.
Test: log config can be updated by pixellogger
Bug: 194493365
Change-Id: I4045908d33abb6c17197ee5c596b945025c5a775
2021-09-28 01:26:49 +00:00
Shinru Han
1a9ababb60
gps: Rename secondary config am: ddcd06372a am: e207cbead8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15880048
Change-Id: I2f203968f30b1bf8865f827e38883015fe681ee1
2021-09-23 02:46:19 +00:00
Shinru Han
eeada35907
gps: Rename secondary config am: ddcd06372a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15880048
Change-Id: I49550a2965dd5a35369d3278e1f3097bb63c94fa
2021-09-23 02:29:59 +00:00
Shinru Han
8108f9d080
gps: Rename secondary config
...
Bug: 200255075
Test: on device
Change-Id: If151b8c215e775de24d3c74d3e46b10ab24f6f4e
2021-09-22 14:51:33 +08:00
Edwin Tung
207478ee2b
[DO NOT MERGE] gps: update gps driver 129.20.23.514871 am: 06041ffe05
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15824553
Change-Id: I01e526453e584d992b9734a9f6c8da0486bdea52
2021-09-17 03:17:52 +00:00
Edwin Tung
fb0dd13ec3
[DO NOT MERGE] gps: update gps driver 129.20.23.514871
...
Restore carrier config after gps crashing
Fix incorrect altitude encoding of LPPe DBH
Bug: 198261454
Bug: 199677624
Sanity Test: 199977515
Test: build pass
Change-Id: I2b75b35a256cbbbd1c94ada0d46974d9c9838976
2021-09-16 09:34:38 +00:00
Edwin Tung
96332941f9
gps: Enable power save mode
...
Bug: 192866284
Test: Enter power duty-cycle
Change-Id: I245e52023c5484e6d9fd4dcba75b5523600598b0
2021-09-15 14:51:02 +00:00
Shinru Han
a575391d96
gps: Configuration split
...
Split configuration for different build variants.
user:
gps_user.xml*, lhd_user.conf, scd_user.conf
userdebug & eng:
gps.xml.*, lhd.conf, scd.conf
Bug: 197586294
Test: on devices
Change-Id: Icddd6be30dfe2c1eb2dca5f9a61c1b9f43867cc6
2021-09-15 13:20:14 +00:00
Edwin Tung
16e8a27f52
gps: update gps driver 129.20.23.513912
...
Fixed a bug of missing ref location in ME switching
Fixed to report velocity type correctly
Increased PGLOR,6,PWR nmea sentence buffer and GLL will print the error log if the sentence is longer than expected
Added a ring buffer for malloc/free debugging with dump
Fixed ESW patch download issue
Bug: 197716902
Bug: 197711819
Bug: 197620911
Bug: 196499748
Bug: 197916943
Sanity Test: 198605012
Test: build pass
Change-Id: I06e25376c194058404e5d65e463086d3d1e2f1d9
2021-09-02 21:02:27 +08:00
Edwin Tung
09ea2fd293
gps: update gps driver 129.20.23.512827
...
Set minimum interval 1000ms for CHRE request
Fix position gap in scheduling request
URA value should not be divided by sqrt of 2 regardless of position source
Enable SvPvt logic even the period is less than 1s
Fixed Native crash: Additional check before using gyro mean as VDR measurement.
Bug: 196499748
Bug: 196927451
Bug: 197141478
Bug: 196851941
Bug: 197061041
Sanity Test: 197583040
Test: build pass
Change-Id: I1409f75e50a7b8402c967957fa4148823d22caea
2021-08-25 09:08:11 +00:00