[automerger skipped] Merge SPL-2020-03-05 Change-Id: I6eabb1bb0e3bd4e507501baa13abf60d7ce8f8e2 skipped: 91068d1ced

Change-Id: I71cf63c64b339b5b0f8a95f866bf8092c2363a91