am 9e7e1243: am 17795736: am 4cc3c4d3: Merge "cpu_ref: fix c++11 narrowing violations"

* commit '9e7e124326cf4c0a20709f313d290fcfecc4f3de':
  cpu_ref: fix c++11 narrowing violations