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

* commit 'f4369128a028f87f9e951f18a955ee0dbc3fcf9d':