am 510aa89c: am 9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev

* commit '510aa89ca32d120f60fd8186b9575dc74b57aada':
  Remove obsolete variables.