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

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