Merge "Create ResourceBasedOverride for SearchSessionManager." into tm-dev