am 45aef351: Merge "Fix two bugs in cpu_ref"

* commit '45aef3511bbbb977e104e3d1179eef751d7e9a32':
  Fix two bugs in cpu_ref