Merge SP1A.211205.008

Bug: 205056467
Merged-In: Ibedad9118c86318958a03e82c86d819c135cd628
Change-Id: I615c76215ffe73f6a4842c0542183db72ecca454