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

* commit 'b3d01579a09d632ecbd090c533687256e520d74f':