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

Change-Id: Iadf1a7911429646351397d067f044620f0952d14