[automerger skipped] Merge SPL-2019-02-05 skipped: 24b9ef8806

Change-Id: Ic10683eee6b08956a4e96e79a1e5d0f6634643a7