[automerger skipped] Merge SPL-2020-03-05 Change-Id: Iec2386e9457520559216b1cc98965595eefdfbea skipped: 19a01e4273

Change-Id: I8883704ba90cde2ebe774ee79d51487c4be63b3f