[automerger skipped] Merge spl-2020-06-05 Change-Id: Iea772a220d6469482621047788d3fbb9337ca5f7 skipped: 1c1b461d98

Change-Id: I269f6ea8b6ef652af2459b2d90a0579ad3f2f461