Merge "Add override to comply with new noImplicitOverride ts compiler option"