[automerger skipped] Merge SPL-2019-07-05 skipped: 6b18d6b375

Change-Id: I1f0f4592cdabf5761bbf3fda76c4d21171153d3c