Merge "Follow the constructor signature change in Minikin." into nyc-dev
am: f9104e3

* commit 'f9104e33e496aeb5581ba9b89f1564d0cbec71fd':
  Follow the constructor signature change in Minikin.

Change-Id: I5d0e3eb8140b28d1ec1313937492713c40816596