remove 'useUpdatedTemplates' flag that's no longer supported. Fix build. am: 7dd9749246 am: ff8cb50979 am: 3578867216 am: 1696dcd4b4
am: f6b5cde9d9

Change-Id: I2259d8cd918b76c6ef22382b08de3c22327a679d