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

* commit '22b7ea6e04173f3cef4e30f572abe226e9b68d55':