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

Change-Id: Ieb37067c2910a2da93816dda56c4aa07f4483510