remove 'useUpdatedTemplates' flag that's no longer supported. Fix build. am: 7dd9749246 am: 689dc4a1fe
am: da493b67a0

Change-Id: I84fbb7c3545dfa71ce9e3269f7d021c4ecf9c7af