diff --git a/tools/public_api_guard/public_api_spec.ts b/tools/public_api_guard/public_api_spec.ts
index 4bc3b9b92a..552ddb8731 100644
--- a/tools/public_api_guard/public_api_spec.ts
+++ b/tools/public_api_guard/public_api_spec.ts
@@ -1048,9 +1048,13 @@ const COMMON = [
 ];
 
 const COMMON_TESTING = [
-  'MockLocationStrategy', 'MockLocationStrategy.back():void', 'MockLocationStrategy.constructor()',
-  'MockLocationStrategy.forward():void', 'MockLocationStrategy.getBaseHref():string',
-  'MockLocationStrategy.internalBaseHref:string', 'MockLocationStrategy.internalPath:string',
+  'MockLocationStrategy',
+  'MockLocationStrategy.back():void',
+  'MockLocationStrategy.constructor()',
+  'MockLocationStrategy.forward():void',
+  'MockLocationStrategy.getBaseHref():string',
+  'MockLocationStrategy.internalBaseHref:string',
+  'MockLocationStrategy.internalPath:string',
   'MockLocationStrategy.internalTitle:string',
   'MockLocationStrategy.onPopState(fn:(value: any) => void):void',
   'MockLocationStrategy.path():string',
@@ -1058,17 +1062,22 @@ const COMMON_TESTING = [
   'MockLocationStrategy.pushState(ctx:any, title:string, path:string, query:string):void',
   'MockLocationStrategy.replaceState(ctx:any, title:string, path:string, query:string):void',
   'MockLocationStrategy.simulatePopState(url:string):void',
-  'MockLocationStrategy.urlChanges:string[]', 'SpyLocation', 'SpyLocation.back():any',
-  'SpyLocation.forward():any', 'SpyLocation.go(path:string, query:string=\'\'):any',
+  'MockLocationStrategy.urlChanges:string[]',
+  'SpyLocation',
+  'SpyLocation.back():any',
+  'SpyLocation.forward():any',
+  'SpyLocation.go(path:string, query:string=\'\'):any',
   'SpyLocation.isCurrentPathEqualTo(path:string, query:string=\'\'):boolean',
-  'SpyLocation.normalize(url:string):string', 'SpyLocation.path():string',
+  'SpyLocation.normalize(url:string):string',
+  'SpyLocation.path():string',
   'SpyLocation.prepareExternalUrl(url:string):string',
   'SpyLocation.replaceState(path:string, query:string=\'\'):any',
-  'SpyLocation.setBaseHref(url:string):any', 'SpyLocation.setInitialPath(url:string):any',
+  'SpyLocation.setBaseHref(url:string):any',
+  'SpyLocation.setInitialPath(url:string):any',
   'SpyLocation.simulateHashChange(pathname:string):any',
   'SpyLocation.simulateUrlPop(pathname:string):any',
   'SpyLocation.subscribe(onNext:(value: any) => void, onThrow:(error: any) => void=null, onReturn:() => void=null):Object',
-  'SpyLocation.urlChanges:string[]'
+  'SpyLocation.urlChanges:string[]',
 ];
 
 const COMPILER = [
@@ -1392,32 +1401,45 @@ const COMPILER = [
 
 const COMPILER_TESTING = [
   'ComponentFixture.autoDetectChanges(autoDetect:boolean=true):any',
-  'ComponentFixture.changeDetectorRef:ChangeDetectorRef', 'ComponentFixture.checkNoChanges():void',
-  'ComponentFixture.componentInstance:any', 'ComponentFixture.componentRef:ComponentRef<T>',
+  'ComponentFixture.changeDetectorRef:ChangeDetectorRef',
+  'ComponentFixture.checkNoChanges():void',
+  'ComponentFixture.componentInstance:any',
+  'ComponentFixture.componentRef:ComponentRef<T>',
   'ComponentFixture.constructor(componentRef:ComponentRef<T>, ngZone:NgZone, autoDetect:boolean)',
-  'ComponentFixture.debugElement:DebugElement', 'ComponentFixture.destroy():void',
+  'ComponentFixture.debugElement:DebugElement',
+  'ComponentFixture.destroy():void',
   'ComponentFixture.detectChanges(checkNoChanges:boolean=true):void',
-  'ComponentFixture.elementRef:ElementRef', 'ComponentFixture.isStable():boolean',
-  'ComponentFixture.nativeElement:any', 'ComponentFixture.ngZone:NgZone',
-  'ComponentFixture.whenStable():Promise<any>', 'ComponentFixture<T>', 'MockDirectiveResolver',
+  'ComponentFixture.elementRef:ElementRef',
+  'ComponentFixture.isStable():boolean',
+  'ComponentFixture.nativeElement:any',
+  'ComponentFixture.ngZone:NgZone',
+  'ComponentFixture.whenStable():Promise<any>',
+  'ComponentFixture<T>',
+  'MockDirectiveResolver',
   'MockDirectiveResolver.resolve(type:Type):DirectiveMetadata',
   'MockDirectiveResolver.setProvidersOverride(type:Type, providers:any[]):void',
   'MockDirectiveResolver.setViewProvidersOverride(type:Type, viewProviders:any[]):void',
-  'MockSchemaRegistry', 'MockSchemaRegistry.attrPropMapping:{[key:string]:string}',
+  'MockSchemaRegistry',
+  'MockSchemaRegistry.attrPropMapping:{[key:string]:string}',
   'MockSchemaRegistry.constructor(existingProperties:{[key:string]:boolean}, attrPropMapping:{[key:string]:string})',
   'MockSchemaRegistry.existingProperties:{[key:string]:boolean}',
   'MockSchemaRegistry.getMappedPropName(attrName:string):string',
   'MockSchemaRegistry.hasProperty(tagName:string, property:string):boolean',
   'MockSchemaRegistry.securityContext(tagName:string, property:string):SecurityContext',
-  'MockViewResolver', 'MockViewResolver.constructor()',
+  'MockViewResolver',
+  'MockViewResolver.constructor()',
   'MockViewResolver.overrideViewDirective(component:Type, from:Type, to:Type):void',
   'MockViewResolver.resolve(component:Type):ViewMetadata',
   'MockViewResolver.setAnimations(component:Type, animations:AnimationEntryMetadata[]):void',
   'MockViewResolver.setInlineTemplate(component:Type, template:string):void',
-  'MockViewResolver.setView(component:Type, view:ViewMetadata):void', 'MockXHR',
-  'MockXHR.expect(url:string, response:string):any', 'MockXHR.flush():any',
-  'MockXHR.get(url:string):Promise<string>', 'MockXHR.verifyNoOutstandingExpectations():any',
-  'MockXHR.when(url:string, response:string):any', 'TestComponentBuilder',
+  'MockViewResolver.setView(component:Type, view:ViewMetadata):void',
+  'MockXHR',
+  'MockXHR.expect(url:string, response:string):any',
+  'MockXHR.flush():any',
+  'MockXHR.get(url:string):Promise<string>',
+  'MockXHR.verifyNoOutstandingExpectations():any',
+  'MockXHR.when(url:string, response:string):any',
+  'TestComponentBuilder',
   'TestComponentBuilder.constructor(_injector:Injector)',
   'TestComponentBuilder.createAsync(rootComponentType:Type):Promise<ComponentFixture<any>>',
   'TestComponentBuilder.createFakeAsync(rootComponentType:Type):ComponentFixture<any>',
@@ -1430,8 +1452,10 @@ const COMPILER_TESTING = [
   'TestComponentBuilder.overrideView(componentType:Type, view:ViewMetadata):TestComponentBuilder',
   'TestComponentBuilder.overrideViewBindings(type:Type, providers:any[]):TestComponentBuilder',
   'TestComponentBuilder.overrideViewProviders(type:Type, providers:any[]):TestComponentBuilder',
-  'TestComponentRenderer', 'TestComponentRenderer.insertRootElement(rootElementId:string):any',
-  'var ComponentFixtureAutoDetect:any', 'var ComponentFixtureNoNgZone:any'
+  'TestComponentRenderer',
+  'TestComponentRenderer.insertRootElement(rootElementId:string):any',
+  'var ComponentFixtureAutoDetect:any',
+  'var ComponentFixtureNoNgZone:any',
 ];
 
 const UPGRADE = [
@@ -1613,7 +1637,7 @@ const PLATFORM_BROWSER_TESTING = [
   'normalizeCSS(css:string):string',
   'stringifyElement(el:any):string',
   'var browserDetection:BrowserDetection',
-  'var expect:(actual: any) => NgMatchers'
+  'var expect:(actual: any) => NgMatchers',
 ];
 
 const PLATFORM_BROWSER_TESTING_E2E = [
@@ -1751,20 +1775,35 @@ const PLATFORM_SERVER_TESTING = [
 ];
 
 const HTTP = [
-  'BaseRequestOptions', 'BaseRequestOptions.constructor()', 'BaseResponseOptions',
-  'BaseResponseOptions.constructor()', 'BrowserXhr', 'BrowserXhr.build():any',
-  'BrowserXhr.constructor()', 'Connection', 'Connection.readyState:ReadyState',
-  'Connection.request:Request', 'Connection.response:any', 'ConnectionBackend',
-  'ConnectionBackend.createConnection(request:any):Connection', 'Headers',
+  'BaseRequestOptions',
+  'BaseRequestOptions.constructor()',
+  'BaseResponseOptions',
+  'BaseResponseOptions.constructor()',
+  'BrowserXhr',
+  'BrowserXhr.build():any',
+  'BrowserXhr.constructor()',
+  'Connection',
+  'Connection.readyState:ReadyState',
+  'Connection.request:Request',
+  'Connection.response:any',
+  'ConnectionBackend',
+  'ConnectionBackend.createConnection(request:any):Connection',
+  'Headers',
   'Headers.append(name:string, value:string):void',
-  'Headers.constructor(headers?:Headers|{[key:string]:any})', 'Headers.delete(name:string):void',
+  'Headers.constructor(headers?:Headers|{[key:string]:any})',
+  'Headers.delete(name:string):void',
   'Headers.entries():any',
   'Headers.forEach(fn:(values: string[], name: string, headers: Map<string, string[]>) => void):void',
   'Headers.fromResponseHeaderString(headersString:string):Headers',
-  'Headers.get(header:string):string', 'Headers.getAll(header:string):string[]',
-  'Headers.has(header:string):boolean', 'Headers.keys():string[]',
-  'Headers.set(header:string, value:string|string[]):void', 'Headers.toJSON():{[key:string]:any}',
-  'Headers.values():string[][]', 'Http', 'Http._backend:ConnectionBackend //protected',
+  'Headers.get(header:string):string',
+  'Headers.getAll(header:string):string[]',
+  'Headers.has(header:string):boolean',
+  'Headers.keys():string[]',
+  'Headers.set(header:string, value:string|string[]):void',
+  'Headers.toJSON():{[key:string]:any}',
+  'Headers.values():string[][]',
+  'Http',
+  'Http._backend:ConnectionBackend //protected',
   'Http._defaultOptions:RequestOptions //protected',
   'Http.constructor(_backend:ConnectionBackend, _defaultOptions:RequestOptions)',
   'Http.delete(url:string, options?:RequestOptionsArgs):Observable<Response>',
@@ -1774,58 +1813,116 @@ const HTTP = [
   'Http.post(url:string, body:any, options?:RequestOptionsArgs):Observable<Response>',
   'Http.put(url:string, body:any, options?:RequestOptionsArgs):Observable<Response>',
   'Http.request(url:string|Request, options?:RequestOptionsArgs):Observable<Response>',
-  'JSONPBackend', 'JSONPConnection', 'JSONPConnection.finished(data?:any):void',
-  'JSONPConnection.readyState:ReadyState', 'JSONPConnection.request:Request',
-  'JSONPConnection.response:Observable<Response>', 'Jsonp',
+  'JSONPBackend',
+  'JSONPConnection',
+  'JSONPConnection.finished(data?:any):void',
+  'JSONPConnection.readyState:ReadyState',
+  'JSONPConnection.request:Request',
+  'JSONPConnection.response:Observable<Response>',
+  'Jsonp',
   'Jsonp.constructor(backend:ConnectionBackend, defaultOptions:RequestOptions)',
   'Jsonp.request(url:string|Request, options?:RequestOptionsArgs):Observable<Response>',
-  'ReadyState', 'ReadyState.Cancelled', 'ReadyState.Done', 'ReadyState.HeadersReceived',
-  'ReadyState.Loading', 'ReadyState.Open', 'ReadyState.Unsent', 'Request',
-  'Request.arrayBuffer():ArrayBuffer', 'Request.blob():Blob',
-  'Request.constructor(requestOptions:RequestArgs)', 'Request.detectContentType():any',
-  'Request.getBody():any', 'Request.headers:Headers', 'Request.json():string',
-  'Request.method:RequestMethod', 'Request.text():string', 'Request.url:string',
-  'Request.withCredentials:boolean', 'RequestMethod', 'RequestMethod.Delete', 'RequestMethod.Get',
-  'RequestMethod.Head', 'RequestMethod.Options', 'RequestMethod.Patch', 'RequestMethod.Post',
-  'RequestMethod.Put', 'RequestOptions', 'RequestOptions.body:any',
+  'ReadyState',
+  'ReadyState.Cancelled',
+  'ReadyState.Done',
+  'ReadyState.HeadersReceived',
+  'ReadyState.Loading',
+  'ReadyState.Open',
+  'ReadyState.Unsent',
+  'Request',
+  'Request.arrayBuffer():ArrayBuffer',
+  'Request.blob():Blob',
+  'Request.constructor(requestOptions:RequestArgs)',
+  'Request.detectContentType():any',
+  'Request.getBody():any',
+  'Request.headers:Headers',
+  'Request.json():string',
+  'Request.method:RequestMethod',
+  'Request.text():string',
+  'Request.url:string',
+  'Request.withCredentials:boolean',
+  'RequestMethod',
+  'RequestMethod.Delete',
+  'RequestMethod.Get',
+  'RequestMethod.Head',
+  'RequestMethod.Options',
+  'RequestMethod.Patch',
+  'RequestMethod.Post',
+  'RequestMethod.Put',
+  'RequestOptions',
+  'RequestOptions.body:any',
   'RequestOptions.constructor({method,headers,body,url,search,withCredentials}:RequestOptionsArgs={})',
   'RequestOptions.headers:Headers',
   'RequestOptions.merge(options?:RequestOptionsArgs):RequestOptions',
-  'RequestOptions.method:RequestMethod|string', 'RequestOptions.search:URLSearchParams',
-  'RequestOptions.url:string', 'RequestOptions.withCredentials:boolean', 'RequestOptionsArgs',
-  'RequestOptionsArgs.body:any', 'RequestOptionsArgs.headers:Headers',
+  'RequestOptions.method:RequestMethod|string',
+  'RequestOptions.search:URLSearchParams',
+  'RequestOptions.url:string',
+  'RequestOptions.withCredentials:boolean',
+  'RequestOptionsArgs',
+  'RequestOptionsArgs.body:any',
+  'RequestOptionsArgs.headers:Headers',
   'RequestOptionsArgs.method:string|RequestMethod',
-  'RequestOptionsArgs.search:string|URLSearchParams', 'RequestOptionsArgs.url:string',
-  'RequestOptionsArgs.withCredentials:boolean', 'Response', 'Response.arrayBuffer():any',
-  'Response.blob():any', 'Response.bytesLoaded:number',
-  'Response.constructor(responseOptions:ResponseOptions)', 'Response.headers:Headers',
-  'Response.json():any', 'Response.ok:boolean', 'Response.status:number',
-  'Response.statusText:string', 'Response.text():string', 'Response.totalBytes:number',
-  'Response.toString():string', 'Response.type:ResponseType', 'Response.url:string',
-  'ResponseOptions', 'ResponseOptions.body:string|Object',
+  'RequestOptionsArgs.search:string|URLSearchParams',
+  'RequestOptionsArgs.url:string',
+  'RequestOptionsArgs.withCredentials:boolean',
+  'Response',
+  'Response.arrayBuffer():any',
+  'Response.blob():any',
+  'Response.bytesLoaded:number',
+  'Response.constructor(responseOptions:ResponseOptions)',
+  'Response.headers:Headers',
+  'Response.json():any',
+  'Response.ok:boolean',
+  'Response.status:number',
+  'Response.statusText:string',
+  'Response.text():string',
+  'Response.totalBytes:number',
+  'Response.toString():string',
+  'Response.type:ResponseType',
+  'Response.url:string',
+  'ResponseOptions',
+  'ResponseOptions.body:string|Object',
   'ResponseOptions.constructor({body,status,headers,statusText,type,url}:ResponseOptionsArgs={})',
   'ResponseOptions.headers:Headers',
   'ResponseOptions.merge(options?:ResponseOptionsArgs):ResponseOptions',
-  'ResponseOptions.status:number', 'ResponseOptions.statusText:string',
-  'ResponseOptions.type:ResponseType', 'ResponseOptions.url:string', 'ResponseType',
-  'ResponseType.Basic', 'ResponseType.Cors', 'ResponseType.Default', 'ResponseType.Error',
-  'ResponseType.Opaque', 'URLSearchParams', 'URLSearchParams.append(param:string, val:string):void',
+  'ResponseOptions.status:number',
+  'ResponseOptions.statusText:string',
+  'ResponseOptions.type:ResponseType',
+  'ResponseOptions.url:string',
+  'ResponseType',
+  'ResponseType.Basic',
+  'ResponseType.Cors',
+  'ResponseType.Default',
+  'ResponseType.Error',
+  'ResponseType.Opaque',
+  'URLSearchParams',
+  'URLSearchParams.append(param:string, val:string):void',
   'URLSearchParams.appendAll(searchParams:URLSearchParams):any',
-  'URLSearchParams.clone():URLSearchParams', 'URLSearchParams.constructor(rawParams:string=\'\')',
-  'URLSearchParams.delete(param:string):void', 'URLSearchParams.get(param:string):string',
-  'URLSearchParams.getAll(param:string):string[]', 'URLSearchParams.has(param:string):boolean',
-  'URLSearchParams.paramsMap:Map<string, string[]>', 'URLSearchParams.rawParams:string=\'\'',
+  'URLSearchParams.clone():URLSearchParams',
+  'URLSearchParams.constructor(rawParams:string=\'\')',
+  'URLSearchParams.delete(param:string):void',
+  'URLSearchParams.get(param:string):string',
+  'URLSearchParams.getAll(param:string):string[]',
+  'URLSearchParams.has(param:string):boolean',
+  'URLSearchParams.paramsMap:Map<string, string[]>',
+  'URLSearchParams.rawParams:string=\'\'',
   'URLSearchParams.replaceAll(searchParams:URLSearchParams):any',
   'URLSearchParams.set(param:string, val:string):any',
-  'URLSearchParams.setAll(searchParams:URLSearchParams):any', 'URLSearchParams.toString():string',
+  'URLSearchParams.setAll(searchParams:URLSearchParams):any',
+  'URLSearchParams.toString():string',
   'XHRBackend',
   'XHRBackend.constructor(_browserXHR:BrowserXhr, _baseResponseOptions:ResponseOptions)',
-  'XHRBackend.createConnection(request:Request):XHRConnection', 'XHRConnection',
+  'XHRBackend.createConnection(request:Request):XHRConnection',
+  'XHRConnection',
   'XHRConnection.constructor(req:Request, browserXHR:BrowserXhr, baseResponseOptions?:ResponseOptions)',
-  'XHRConnection.readyState:ReadyState', 'XHRConnection.request:Request',
+  'XHRConnection.readyState:ReadyState',
+  'XHRConnection.request:Request',
   'XHRConnection.response:Observable<Response>',
-  'XHRConnection.setDetectedContentType(req:any, _xhr:any):any', 'const HTTP_BINDINGS:any',
-  'const HTTP_PROVIDERS:any[]', 'const JSONP_PROVIDERS:any[]', 'const JSON_BINDINGS:any'
+  'XHRConnection.setDetectedContentType(req:any, _xhr:any):any',
+  'const HTTP_BINDINGS:any',
+  'const HTTP_PROVIDERS:any[]',
+  'const JSONP_PROVIDERS:any[]',
+  'const JSON_BINDINGS:any',
 ];
 
 const HTTP_TESTING = [