am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

* commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610':
  Add some clarifying defines.