[automerger skipped] Merge SPL-2020-03-05 Change-Id: Icd8f216105da91329f832d609439d12b90acab0e skipped: 4cc857ddeb

Change-Id: I645b0a66544e0aa4adbe2b6593757b78796e73c0