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

Change-Id: Ib752a8fc535b7856b0881c79d306c33026f3f5ee