Merge "base: avoid evaluating macro argument multiple times." am: 00bfc4480e am: da3c1f9bce

Change-Id: I8fc441c799ad4915f5ef6a6d73c03d16250923a7