Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0
am: 0562b43a09

* commit '0562b43a090427b8adf7eb4dd9716be91b1c5cf7':