[automerger skipped] Merge SPL-2019-05-05 skipped: 1aa2c91fac

Change-Id: I5ceb3ff547a64fbe95fc825ac119813d691c802c