[automerger skipped] Merge spl-2020-08-05 skipped: ce4969c58e

Change-Id: I102c260c0b1de5da9e00eeddc3787e40e6b1bcbf