[automerger skipped] Merge spl-2021-03-05 skipped: ba461c6722

Change-Id: I1b59f0d9aa0a90ae69b9e1949a07e61360a96e10