am 1f1f159f: am cfb7ebe1: Merge "Fix C++11 violations"

* commit '1f1f159fdfb0512ddca6221a091805a85b4429f1':
  Fix C++11 violations