am 6f2f7e76: am 8afc18fc: am 3af030b4: am 62f28f94: Merge "Fix a compile assert name with inverted meaning."

* commit '6f2f7e76f85aa1745a9e2ab5a07cbfc5b0ed260d':