LP#1801984 Upgrading Angular 6 to Angular 7