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

Change-Id: I45e34ec43b860961be86504e721c79c47c62cebe