[automerger skipped] Merge SPL-2019-02-05 skipped: 1f7af5f839

Change-Id: I150d57cd8465995380c5183260dadc039b479847