[automerger skipped] Merge SPL-2019-12-05 skipped: a32ffe8c12

Change-Id: Ie60ee02058d9139e50aebb2816cb9be0a6b95fda