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