Also changed all related macros and tests Change-Id: I5269578c0f716fd391111a43932f856778494d29
Factor out the subtraction operator as common function. Change-Id: I526e703477c6a290e0e3e3c8898f8bb1ca82779b