Use common props from spyder 98.72.16 JB 4.1.2 ota

Change-Id: I1054c4334483826464213c1cc28eece89d039486