Merge SP1A.211205.008

Bug: 205056467
Merged-In: I8a5e9655e6c40404389344e78c21b0ebd5a1a4b9
Change-Id: I88c2245a692f1533064a43fcfafb348622d8064e