[automerger skipped] Merge SPL-2020-03-05 skipped: b3748c1541

Change-Id: Ic88670614023f7d51b14d5a7395fa36079eedb84