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

Change-Id: Idc0802efcb3d642c2ae4c27bc9656497e9f10edb