[automerger skipped] Merge SPL-2019-08-01 skipped: 2eacb13f29

Change-Id: Iec6ef63cc58d52897d7ba4e2fae0dfe9e3008427