am 9e0d8d6e: Merge "Fix white space issues and long long use in assertion."

* commit '9e0d8d6efdbc46d3364eb3d02a4686f00cc8e6ca':
  Fix white space issues and long long use in assertion.