am bd3e0b2f: am cd5c678d: (-s ours) am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.

* commit 'bd3e0b2f04fb298b2a6335b33e51b8d30bdadf0f':