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

* commit 'fbab2ed4edc87995407f0898aae5e0f0253be026':