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

Change-Id: I2387f0c7fc01a16c1ed4737b19659752af337bf7