Don't rely (solely) on templates for geonotahack

Corresponding GeoData change: Iddea16b050c06ee6953682a359b13e00d2497d92

Bug: 58979
Change-Id: I593b222c899e37db15416adc931e36750f0fc972
Merge "Don't rely (solely) on templates for geonotahack"