Merge SP1A.211205.008

Bug: 205056467
Merged-In: If47f76ed9e034ed73c84cb0d92f2d31ffb1fbbf9
Change-Id: I1be84a44f5be45b196858f4fe3e775128316b35b