[automerger skipped] Merge SPL-2019-08-01 skipped: af465d71c1 am: 674c04ebde

Change-Id: If21f5e6f3c60c49fe31667bbdb6501040f78008c