[automerger skipped] Merge SPL-2020-03-05 Change-Id: I64e2c3dc011ac32d7eab57e9523bb5f6380567d6 skipped: ae09d6232a

Change-Id: I50d3d6b2fc6dbf6471507433df424bb675b6bebd