am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da':
  Remove references to non-std Java classes. [DO NOT MERGE]