The template files we override do not appear to have changed between 1.17.3 and 1.17.4. This update should get us into a spot where we can plan to upgrade to 1.18. Change-Id: I9690a7339bb8ca913ca279c9eaf3ff13eefff9e1