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

Change-Id: I27928f6def81589e128432a524d0830a4004430e