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

Change-Id: I2311b2f8efba0d1d0940e74324f5ec4e8d4e87e7