[automerger skipped] Merge spl-2020-06-05 Change-Id: If0d50dcd4f74636b72a1ac3e27e0e615f56633ae skipped: 1521ffdd72

Change-Id: I981c2a6c5820661b4f309368af0ced30d3744d3a