Also changed all related macros and tests Change-Id: I5269578c0f716fd391111a43932f856778494d29
Change-Id: I7bc991abea383db1f86c1bb0f2e849837b54d90f