[automerger skipped] Merge SPL-2018-12-05 skipped: d8134a3e70

Change-Id: I25f91a8a4e6f31d7d38fb39ae16819c5e47a8741