[automerger skipped] Merge SPL-2019-05-05 skipped: fd1f47f90c

Change-Id: I46dbd4ef2efff3f315d37998293f1600ada6d97d