[automerger skipped] Merge SPL-2020-03-05 Change-Id: Iddb80d76db4eb227433c6f055ce64edc3e88bc0e skipped: b16938cbac

Change-Id: I0a993003fb78fb088e70268d28af085f3753f600