[automerger skipped] Merge spl-2020-06-05 Change-Id: I4faef6b18fbbd309a5b44a8df4a245385ef5c148 skipped: 2459488f05

Change-Id: Ie7adb35365558f85f46a9d271b8e8d3f9a2a76c7