Google internally has more strict rules for Typescript than we have in the open-source version. This change fix such typescript code to match internall google rules. Later we plan to add appropriate checks into the open-source version. Change-Id: I39f831409a72386bba66da578a6ff9e284217872