[automerger skipped] Merge spl-2020-06-05 Change-Id: I9068b05c66dee4030ddcaa2cbeae098dc9a013e9 skipped: c19084bc5b

Change-Id: I756b86e9312157f7d09d157b69095fbe1c555d67