Merge changes I51e9bcff,I42ade83f into studio-1.3-dev
automerge: 06c3165

* commit '06c31655b5b2f8a476e824ca1d5b05f86bddcec8':
  Convert Base and AndroidComponentModelPlugin to java. part2
  Convert Base and AndroidComponentModelPlugin to java. part1