Merge "Revert ResolverActivity changes associated with browseables." into rvc-dev am: 101fcc5746 am: cc9f819283 am: 656fe5fe04
Change-Id: I62bb597218e28631bafc7017449a4d891dc609f7
This commit is contained in: