Merge "Undef before redefining macros" am: 028c26c2d0
am: 46fbc9c701

Change-Id: I0e1c6556b1e483c6d8f753b15c90e6f5f835e6e1