Merge "Update Makefile and scripts after Quick removal."
am: e2aad5d

* commit 'e2aad5d8dba805e510476ded22737a2adffbef72':
  Update Makefile and scripts after Quick removal.