[automerger skipped] Merge SPL-2019-07-05 skipped: d3ceb5f450

Change-Id: I420c8135ee45ba3827c5ced49fcf213e23652d3f