[automerger skipped] Merge spl-2020-06-05 Change-Id: I3e81f144da311cd07aec39962dfa398253cb4873 skipped: e34659a661

Change-Id: Ib89af0f7ebfd89d8cae92d2627889825feb8dc2f