[automerger skipped] Merge spl-2020-06-05 Change-Id: Ibb4eeab10f0733e59f4ebffbfde052a5fd0ce1d7 skipped: 1504c4bbf4

Change-Id: I75d8dcebcb5d561bad68cbd10a2e431d01722391